Thibaut Girka e7f1bfdc2d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.		2018-12-09 16:08:04 +01:00
..
admin	Add profile directory (#9427)	2018-12-06 17:36:11 +01:00
settings
application_helper.rb	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-22 17:51:38 +02:00
flashes_helper.rb
home_helper.rb	Redesign forms, verify link ownership with rel="me" (#8703)	2018-09-18 16:45:58 +02:00
instance_helper.rb
jsonld_helper.rb	Improve federated ID validation (#8372)	2018-08-22 20:55:14 +02:00
mailer_helper.rb
routing_helper.rb
settings_helper.rb	Add Czech language option and locale data (#8594)	2018-09-05 08:50:06 +09:00
stream_entries_helper.rb	Redesign admin accounts index (#9340)	2018-11-26 15:53:27 +01:00