about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorJenkins <jenkins@jenkins.ninjawedding.org>2018-01-05 22:17:12 +0000
committerJenkins <jenkins@jenkins.ninjawedding.org>2018-01-05 22:17:12 +0000
commitf6adb409fd8f4bf42c1da54cc1e7e42886612c14 (patch)
tree01ab66d37a57fbe59546f6376e16c8398b5198d8 /app/javascript
parentf41b33eb0177b23bd72fede7df94af43da0c7c6b (diff)
parent10f6793fd0af3690a37c868b7bb4418418dc3a7a (diff)
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/mastodon/locales/whitelist_sr-Latn.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/whitelist_sr-Latn.json b/app/javascript/mastodon/locales/whitelist_sr-Latn.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_sr-Latn.json
@@ -0,0 +1,2 @@
+[
+]