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
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
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml
navigation.rb
puma.rb
routes.rb
secrets.yml
settings.yml
sidekiq.yml
webpacker.yml	Upgrade Webpacker to version 2.0 (#3729)	2017-06-18 02:57:09 +02:00