about summary refs log tree commit diff
path: root/app/javascript/mastodon/locales/whitelist_ml.json
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-11-21 10:01:26 +0100
committerGitHub <noreply@github.com>2019-11-21 10:01:26 +0100
commit55f5e81a9dc4c6cede5d43e549061be2ea9be614 (patch)
tree6b8944b2bf8e13ba76627a0e38886dfb3b35c566 /app/javascript/mastodon/locales/whitelist_ml.json
parent707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff)
parente87cc59811fab285033cc78d97ad7f0b8df9c081 (diff)
Merge pull request #1246 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/mastodon/locales/whitelist_ml.json')
-rw-r--r--app/javascript/mastodon/locales/whitelist_ml.json2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/javascript/mastodon/locales/whitelist_ml.json b/app/javascript/mastodon/locales/whitelist_ml.json
new file mode 100644
index 000000000..0d4f101c7
--- /dev/null
+++ b/app/javascript/mastodon/locales/whitelist_ml.json
@@ -0,0 +1,2 @@
+[
+]