chinwagsocial/config
JohnD28 691e9112f3 Update fr.yml ()
* Update fr.yml

Update of french translation and reformatting Privacy Policy for better maintenance.

* Update fr.yml

* Update fr.yml

* Update fr.yml

Corrections suivant les remarques d'Alda.

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

I have replaced my proposals with those accepted here to reduce the conflict.

https://github.com/tootsuite/mastodon/pull/5340

J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit.

Comment dois-je faire à l'avenir pour éviter ce genre de situations ?

* Update fr.yml

Conflict reduction.
2017-10-12 15:25:34 +02:00
..
environments Replace self-rolled statsd instrumention with localshred/nsa () 2017-09-29 03:16:44 +02:00
initializers Remove timestamps on any option () 2017-10-09 17:52:02 +02:00
locales Update fr.yml () 2017-10-12 15:25:34 +02:00
webpack Remove prop types from external libraries () 2017-10-10 18:44:51 +02:00
application.rb Set snowflake IDs for backdated statuses () 2017-10-08 17:34:34 +02:00
boot.rb Adds bootsnap. Faster boot time () 2017-05-20 19:42:27 +02:00
brakeman.ignore Set snowflake IDs for backdated statuses () 2017-10-08 17:34:34 +02:00
database.yml fix unnecessary variable () 2017-06-25 23:29:22 +02:00
deploy.rb Update Capistrano lock version in config/deploy.rb () 2017-07-25 01:14:01 +02:00
environment.rb Make PreviewCard records reuseable between statuses () 2017-09-01 16:20:16 +02:00
i18n-tasks.yml Generate 500.html with assets:precompile, remove loading from Google Fonts () 2017-09-25 04:04:04 +02:00
navigation.rb Implement EmailBlackList () 2017-10-04 15:16:10 +02:00
puma.rb Do not set port for puma if it is bound to unix socket () 2017-04-22 01:22:20 +02:00
routes.rb Add moderation note () 2017-10-07 20:26:43 +02:00
secrets.yml Upgrade to Rails 5.0.0.1 2016-08-17 17:58:00 +02:00
settings.yml Add support for multiple themes () 2017-09-19 16:36:23 +02:00
sidekiq.yml Randomize sidekiq-scheduler cron schedule () 2017-09-17 11:58:20 +02:00
themes.yml Add support for multiple themes () 2017-09-19 16:36:23 +02:00
webpacker.yml Upgrade Webpacker to version 3.0.1 () 2017-09-27 14:41:54 +02:00