David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master		2017-11-16 22:52:37 -06:00
..
admin	Fix some rubocop style issues (#5730)	2017-11-17 10:06:26 +09:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
application_helper.rb	Add moderator role and add pundit policies for admin actions (#5635)	2017-11-11 20:23:33 +01:00
flashes_helper.rb	…
home_helper.rb	…
instance_helper.rb	…
jsonld_helper.rb	Allow ActivityPub Note's tag and attachment to be single objects (#5534)	2017-10-27 16:10:36 +02:00
routing_helper.rb	…
settings_helper.rb	Swedish translation (#5406)	2017-10-17 13:41:36 +09:00
stream_entries_helper.rb	…