Skip to content
Commit e2d13694 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Merge branch '1.2'



Signed-off-by: default avatarBenoit Mortier <benoit.mortier@opensides.be>

Conflicts:
	Changelog
	contrib/docs/UPGRADE
	contrib/man/fusiondirectory-insert-schema.1
	contrib/man/fusiondirectory-setup.1
	contrib/man/fusiondirectory.conf.5
	include/variables_common.inc
	locale/ar/fusiondirectory.po
	locale/ca/fusiondirectory.po
	locale/cs_CZ/fusiondirectory.po
	locale/de/fusiondirectory.po
	locale/el_GR/fusiondirectory.po
	locale/en/fusiondirectory.po
	locale/es/fusiondirectory.po
	locale/es_CO/fusiondirectory.po
	locale/es_VE/fusiondirectory.po
	locale/fa_IR/fusiondirectory.po
	locale/fi_FI/fusiondirectory.po
	locale/fr/fusiondirectory.po
	locale/hu_HU/fusiondirectory.po
	locale/id/fusiondirectory.po
	locale/it_IT/fusiondirectory.po
	locale/lv/fusiondirectory.po
	locale/nb/fusiondirectory.po
	locale/nl/fusiondirectory.po
	locale/pl/fusiondirectory.po
	locale/pt/fusiondirectory.po
	locale/pt_BR/fusiondirectory.po
	locale/ru/fusiondirectory.po
	locale/ru@petr1708/fusiondirectory.po
	locale/sv/fusiondirectory.po
	locale/ug/fusiondirectory.po
	locale/vi_VN/fusiondirectory.po
	locale/zh/fusiondirectory.po
parents 4f959e02 32e97332
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment