You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka c91d9b7389 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml config/locales/simple_form.ja.yml config/locales/simple_form.pl.yml config/routes.rb		6 years ago
..
chewy	…
controllers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
helpers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
javascript	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
lib	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
mailers	…
models	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
policies	…
presenters	…
serializers	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
services	…
validators	…
views	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
workers	…