FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app
History
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
 		2019-05-10 17:09:12 +02:00
..
chewy
…
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-05-10 17:09:12 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-05-10 17:09:12 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-05-10 17:09:12 +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-05-10 17:09:12 +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-05-04 16:37:26 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
views Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 16:37:26 +02:00