luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-09-15 22:49:44 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Thibaut Girka 04534604c6 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/views/admin/dashboard/index.html.haml
- config/locales/simple_form.en.yml
2019-08-07 13:56:48 +02:00
..
chewy Fix NameError (#11192) 2019-06-27 09:16:55 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
mailers Change admin UI for hashtags and add back whitelisted trends (#11490) 2019-08-05 19:54:29 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
presenters
serializers Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-08-06 13:16:53 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-08-07 13:56:48 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-07-28 16:28:05 +02:00