spla 4367443287 Added new Catalan strings (#3843) ...

* 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

2017-06-19 10:29:18 +02:00

..

environments

Support multiple trusted proxy ip addresses (#3639)

2017-06-08 14:33:28 +02:00

initializers

Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)

2017-06-19 01:51:04 +02:00

locales

Added new Catalan strings (#3843)

2017-06-19 10:29:18 +02:00

webpack

Upgrade Webpacker to version 2.0 (#3729)

2017-06-18 02:57:09 +02:00

application.rb

Set config.cache_store in environments file. (#3219)

2017-05-22 15:01:02 +02:00

boot.rb

Adds bootsnap. Faster boot time (#3176)

2017-05-20 19:42:27 +02:00

brakeman.ignore

Enable CodeClimate Brakeman checks (#2861)

2017-05-07 02:45:33 +02:00

database.yml

Added support parallel_tests (#2740)

2017-05-03 12:20:38 +02:00

deploy.rb

Update capistrano lock version to 3.8.1 (#3056)

2017-05-14 17:38:29 +02:00

environment.rb

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

i18n-tasks.yml

Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)

2017-06-05 01:02:19 +02:00

navigation.rb

Account deletion (#3728)

2017-06-14 18:01:27 +02:00

puma.rb

Do not set port for puma if it is bound to unix socket (#2289)

2017-04-22 01:22:20 +02:00

routes.rb

Account deletion (#3728)

2017-06-14 18:01:27 +02:00

secrets.yml

Upgrade to Rails 5.0.0.1

2016-08-17 17:58:00 +02:00

settings.yml

Added support for configurable reserved usernames (fix of #1382) (#3566)

2017-06-05 01:03:45 +02:00

sidekiq.yml

Replace mastodon:media:clear and mastodon:feeds:clear rake tasks with (#3180)

2017-05-20 19:42:58 +02:00

webpacker.yml

Upgrade Webpacker to version 2.0 (#3729)

2017-06-18 02:57:09 +02:00