mastodon/config
spla 10cdad3e7d 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
2017-08-10 21:52:40 +09:00
..
environments Add SMTP_TLS variable for configuring TLS when server uses non-standard port (#4227) 2017-07-16 23:48:35 +02:00
initializers Add ActivityPub inbox (#4216) 2017-08-08 21:52:15 +02:00
locales Added new catalan strings (#4574) 2017-08-10 21:52:40 +09:00
webpack Enable cache for babel-loader (#4505) 2017-08-03 17:46:49 +02:00
application.rb Add "signed in as" header to some pages (#4523) 2017-08-05 04:24:58 +02:00
boot.rb
brakeman.ignore
database.yml
deploy.rb Update Capistrano lock version in config/deploy.rb (#4352) 2017-07-25 01:14:01 +02:00
environment.rb
i18n-tasks.yml Ignore some locale keys that can but do not need to be translated (#4515) 2017-08-04 04:42:28 +02:00
navigation.rb
puma.rb
routes.rb Add ActivityPub inbox (#4216) 2017-08-08 21:52:15 +02:00
secrets.yml
settings.yml Add default settings for user (#4393) 2017-07-27 15:12:51 +02:00
sidekiq.yml Move clean up of unconfirmed users to sidekiq-scheduler (#4336) 2017-07-24 16:17:55 +02:00
webpacker.yml