luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-02 11:33:36 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript
History
Thibaut Girka 6f75a9001f Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/stream_entries/_simple_status.html.haml
- config/locales/nl.yml

Deleted unused translation strings (themes) and adapted minor changes to
_simple_status.html.haml
2018-08-31 19:10:57 +02:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
flavours Add option to not automatically unfold content warnings matching a regexp 2018-08-31 18:35:03 +02:00
fonts
images Merge branch 'master' into glitch-soc/tentative-merge 2018-07-09 07:13:59 +02:00
locales
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-08-31 19:10:57 +02:00
packs Merge branch 'master' into glitch-soc/merge-upstream 2018-08-26 14:23:24 +02:00
skins
styles Merge branch 'master' into glitch-soc/merge-upstream 2018-08-31 19:10:57 +02:00