mastodon/config
spla f63a40e7c2 Updated Catalan strings (#5323)
* 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

* Updated Catalan strings

* Updated Catalan strings
2017-10-14 14:40:35 +02:00
..
environments Replace self-rolled statsd instrumention with localshred/nsa (#5118) 2017-09-29 03:16:44 +02:00
initializers Remove timestamps on any option (#5282) 2017-10-09 17:52:02 +02:00
locales Updated Catalan strings (#5323) 2017-10-14 14:40:35 +02:00
webpack Remove prop types from external libraries (#5304) 2017-10-10 18:44:51 +02:00
application.rb Set snowflake IDs for backdated statuses (#5260) 2017-10-08 17:34:34 +02:00
boot.rb
brakeman.ignore Set snowflake IDs for backdated statuses (#5260) 2017-10-08 17:34:34 +02:00
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb Implement EmailBlackList (#5109) 2017-10-04 15:16:10 +02:00
puma.rb
routes.rb Add moderation note (#5240) 2017-10-07 20:26:43 +02:00
secrets.yml
settings.yml
sidekiq.yml
themes.yml
webpacker.yml Upgrade Webpacker to version 3.0.1 (#5122) 2017-09-27 14:41:54 +02:00