about summary refs log tree commit diff
path: root/public/emoji/1f46e-1f3fd.png
diff options
context:
space:
mode:
authorspla <spla@mastodont.cat>2017-08-10 14:52:40 +0200
committerYamagishi Kazutoshi <ykzts@desire.sh>2017-08-10 21:52:40 +0900
commit10cdad3e7d9be948bf7dab2c84d2a803224fdda8 (patch)
tree0916338f1fdbccd935ef0e037ac601ca6b28f07a /public/emoji/1f46e-1f3fd.png
parentd9a1fb134a407aaa7fcff5be285d7414a0cb43ed (diff)
Added new catalan strings (#4574)
* Add Catalan language

* Add Catalan language

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update settings_helper.rb

* Update mastodon.js

* Update index.js

* Update application.rb

* Update ca.yml

* removed extra spaces at line 225

* Catalan translation update

added activerecord.ca.yml

* Update activerecord.ca.yml

Done

* Updated activerecord.ca.yml

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Update ca.json

Removed :

<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master

* Syncing to master

* Added new Catalan strings

* removed config.secret_key line

* Corrected <sotrong> tag to <strong>

Line 515

* Removed extra line

* Reverted

* yarn.lock reverted
Diffstat (limited to 'public/emoji/1f46e-1f3fd.png')
0 files changed, 0 insertions, 0 deletions