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		8 years ago
..
environments	Support multiple trusted proxy ip addresses (#3639)	8 years ago
initializers	Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)	8 years ago
locales	Added new Catalan strings (#3843)	8 years ago
webpack	Upgrade Webpacker to version 2.0 (#3729)	8 years ago
application.rb	Set config.cache_store in environments file. (#3219)	8 years ago
boot.rb	Adds bootsnap. Faster boot time (#3176)	8 years ago
brakeman.ignore	Enable CodeClimate Brakeman checks (#2861)	8 years ago
database.yml	Added support parallel_tests (#2740)	8 years ago
deploy.rb	Update capistrano lock version to 3.8.1 (#3056)	8 years ago
environment.rb	Upgrade to Rails 5.0.0.1	9 years ago
i18n-tasks.yml	Add date to ignore_missing and ignore_unused in config/i18n-tasks.yml (#3572)	8 years ago
navigation.rb	Account deletion (#3728)	8 years ago
puma.rb	Do not set port for puma if it is bound to unix socket (#2289)	8 years ago
routes.rb	Account deletion (#3728)	8 years ago
secrets.yml	Upgrade to Rails 5.0.0.1	9 years ago
settings.yml	Added support for configurable reserved usernames (fix of #1382) (#3566)	8 years ago
sidekiq.yml	Replace mastodon:media:clear and mastodon:feeds:clear rake tasks with (#3180)	8 years ago
webpacker.yml	Upgrade Webpacker to version 2.0 (#3729)	8 years ago