Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
..
2018-12-12 05:54:34 +01:00
2018-10-07 23:44:58 +02:00
2017-03-02 18:49:32 +01:00
2019-03-03 22:18:23 +01:00