tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source 
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
This commit is contained in:
Thibaut Girka
2018-08-31 19:10:57 +02:00
parent c6942a5283 55880c7098
commit 6f75a9001f
57 changed files with 1292 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/locales/defaultMessages.json
View File

@@ -2128,4 +2128,4 @@
],
"path": "app/javascript/mastodon/features/video/index.json"
}
]
]