caisse-bliss/translations
tykayn f591d2a081 Merge branch 'master' of https://framagit.org/tykayn/caisse-bliss
# Conflicts:
#	LICENSE
#	app/config/routing.yml
#	app/config/security.yml
#	assets/js/parts/main.js
2019-07-04 14:35:00 +02:00
..
messages.en.yml Merge branch 'master' of https://framagit.org/tykayn/caisse-bliss 2019-07-04 14:35:00 +02:00
messages.fr.yml Merge branch 'master' of https://framagit.org/tykayn/caisse-bliss 2019-07-04 14:35:00 +02:00