tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
aaec64a500
mastodon/app
History
Thibaut Girka aaec64a500 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/settings/preferences_controller.rb
- app/lib/user_settings_decorator.rb
- app/models/user.rb
- config/locales/simple_form.en.yml
2019-06-26 23:19:22 +02:00
..
chewy Apply filters to poll options (#11174) 2019-06-25 14:45:14 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
mailers Fix error in AdminMailer#new_pending_account (#10264) 2019-03-14 14:20:22 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-03-14 17:17:20 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-06-26 23:19:22 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-06-07 17:00:36 +02:00