1. 06 Sep, 2017 10 commits
  2. 01 Sep, 2017 1 commit
  3. 26 Jul, 2017 2 commits
  4. 25 Jul, 2017 2 commits
  5. 24 Jul, 2017 4 commits
  6. 18 Jul, 2017 3 commits
  7. 11 Jul, 2017 2 commits
  8. 10 Jul, 2017 2 commits
  9. 05 Jul, 2017 1 commit
  10. 02 Jul, 2017 1 commit
  11. 28 Jun, 2017 3 commits
    • Benoit Mortier's avatar
      Merge branch '1.2' · e2d13694
      Benoit Mortier authored
      
      
      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
      e2d13694
    • Benoit Mortier's avatar
    • Benoit Mortier's avatar
      320e200c
  12. 27 Jun, 2017 1 commit
  13. 23 Jun, 2017 4 commits
  14. 22 Jun, 2017 4 commits