luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 16:24:00 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 01eaeab56d Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/application_controller.rb`:
  Conflict due to theming system.
- `app/controllers/oauth/authorizations_controller.rb`:
  Conflict due to theming system.
2020-01-04 23:04:42 +01:00
..
core Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
flavours [Glitch] Fix manual scrolling issue on Firefox/Windows 2019-12-19 14:43:47 +01:00
fonts
images
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-11-06 14:38:28 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2020-01-04 23:04:42 +01:00