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
444796b69b
mastodon/app
History
Thibaut Girka 444796b69b Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/application_controller.rb
- app/controllers/auth/confirmations_controller.rb
- app/controllers/auth/sessions_controller.rb
- app/controllers/settings/deletes_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
2019-07-23 10:51:07 +02:00
..
chewy Fix NameError (#11192) 2019-06-27 09:16:55 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
mailers Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02: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-07-23 10:51:07 +02:00
services Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +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-07-23 10:51:07 +02:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00