about summary refs log tree commit diff
path: root/spec/models/account_spec.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-08-31 19:10:57 +0200
committerThibaut Girka <thib@sitedethib.com>2018-08-31 19:10:57 +0200
commit6f75a9001f6ba8e47c80767d8406cfeb11a79690 (patch)
tree7f988360fd5b6aefa1ddd4255926bb20025fd27f /spec/models/account_spec.rb
parentc6942a528332e99b605efa95ffa1c710324d368c (diff)
parent55880c70981bac9278e7f8584f9d4ecd78f1ba6b (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
Diffstat (limited to 'spec/models/account_spec.rb')
0 files changed, 0 insertions, 0 deletions