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
..
2019-02-02 12:25:04 +01:00
2019-02-02 12:25:04 +01:00
2018-09-29 19:03:33 +02:00
2019-02-02 19:11:38 +01:00
2018-08-29 21:13:49 +02:00