Thibaut Girka 280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/status.rb db/migrate/20180528141303_fix_accounts_unique_index.rb db/schema.rb Resolved by taking upstream changes (no real conflicts, just glitch-soc specific code too close to actual changes).		2018-08-17 17:43:54 +02:00
..
admin.js	Merge branch 'master' into glitch-soc/merge-upstream	2018-08-17 17:43:54 +02:00
common.js
embed.js
mailer.js
public.js
settings.js
theme.yml