3 Commits

Author	SHA1	Message	Date
Luc Didry	f27cf293dd	Create a conflict on zanata.xml between master and dev branches	2018-03-11 10:26:54 +01:00
Luc Didry	b6ac7d2818	Set zanata.xml to master version	2018-03-09 19:51:33 +01:00
Luc Didry	6daabaf054	Zanata integration	2018-03-03 18:12:40 +01:00