Thibaut Girka 334f478db1 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	Avoid loading rails-ujs twice on vanilla flavour	2018-07-16 16:42:52 +02:00
embed.js	…
mailer.js	…
public.js	Scroll to linked status in public status view	2018-08-07 16:58:00 +02:00
settings.js	Restore glitch-soc's 500 characters limit for bios (fixes #625)	2018-08-06 08:20:29 +02:00
theme.yml	…