treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 579ccb0bb9 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
..
core Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
flavours Clean up redundant shouldUpdateScroll definitions 2019-07-21 20:57:42 +02:00
fonts
…
images Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
locales
…
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00
skins
…
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-07-23 10:51:07 +02:00