luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2025-01-23 13:06:45 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 02062aab55 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/about_controller.rb
- app/controllers/tags_controller.rb
- app/views/about/show.html.haml
- spec/views/about/show.html.haml_spec.rb
2019-03-13 15:16:02 +01:00
..
core Fix CW fold/unfold in remote interaction dialog 2019-02-17 15:40:49 +01:00
flavours Remove leftover console.log 2019-03-11 14:39:45 +01:00
fonts
images Merge branch 'master' into glitch-soc/merge-upstream 2019-01-02 15:36:53 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2019-02-17 12:26:55 +01:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00