Thibaut Girka 41a98b6543 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - README.md - app/helpers/statuses_helper.rb Upstream moved account helpers to their own file, we had extra helpers there, moved too. - app/lib/sanitize_config.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - config/locales/simple_form.en.yml - spec/lib/sanitize_config_spec.rb		2019-10-27 12:14:01 +01:00
..
exports
migration
preferences
two_factor_authentication
aliases_controller.rb
applications_controller.rb
base_controller.rb	Revert some refactoring in order to make codebase closer to upstream	2019-07-23 10:51:12 +02:00
deletes_controller.rb
exports_controller.rb
featured_tags_controller.rb
flavours_controller.rb
identity_proofs_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-06-24 15:02:59 +02:00
imports_controller.rb
migrations_controller.rb
preferences_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
profiles_controller.rb
sessions_controller.rb
two_factor_authentications_controller.rb