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
..
FOSUserBundle/views	login translate	2018-09-18 16:47:58 +02:00
HWIOAuthBundle	translation files and menu	2018-09-18 16:36:14 +02:00
views	Merge branch 'master' of https://framagit.org/tykayn/caisse-bliss	2019-07-04 14:35:00 +02:00