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	Prevent actions log from crashing when displaying deleted status (fixes #8133) (#8219)	2018-08-16 20:05:26 +02:00
settings
application_helper.rb	Add more granular OAuth scopes (#7929)	2018-07-05 18:31:35 +02:00
flashes_helper.rb
home_helper.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02:00
instance_helper.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	2018-03-04 20:29:49 +01:00
jsonld_helper.rb	Fetch boosted statuses on behalf of a follower (fixes #7426) (#7459)	2018-05-12 16:48:32 +02:00
mailer_helper.rb
routing_helper.rb
settings_helper.rb	i18n: fix Slovak language name (#8169)	2018-08-11 14:52:05 +09:00
stream_entries_helper.rb	Redesign public profiles and toots (#8068)	2018-07-28 19:25:33 +02:00