diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2020-12-15 14:27:06 +0100 |
| commit | e4f8679eaeea062e1f9ca9f58703b51ff8162c35 (patch) | |
| tree | 13940a853f1278a3c4ef89dd3a0bbedfeaaf7140 /spec/models/encrypted_message_spec.rb | |
| parent | 1978f7265e1e83bda25413da26f53c53110af764 (diff) | |
| parent | 8485c436d5d083c28df8c942fe521bfb46edfc9f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.
Diffstat (limited to 'spec/models/encrypted_message_spec.rb')
0 files changed, 0 insertions, 0 deletions