1. 18 Mar, 2016 2 commits
    • Mortier Benoit's avatar
      Merge branch '1.0.10' · 48333c0e
      Mortier Benoit authored
      
      Signed-off-by: default avatarMortier Benoit <benoit.mortier@opensides.be>
      
      Conflicts:
      	Changelog
      	contrib/bin/fusiondirectory-setup
      	contrib/docs/UPGRADE
      	contrib/man/fusiondirectory-insert-schema.1
      	contrib/man/fusiondirectory-setup.1
      	contrib/man/fusiondirectory.conf.5
      	html/index.php
      	include/class_config.inc
      	include/functions.inc
      	include/simpleplugin/class_simplePlugin.inc
      	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/fr/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
      	plugins/admin/groups/class_ogroup.inc
    • Mortier Benoit's avatar
      820264f2
  2. 17 Mar, 2016 4 commits
  3. 16 Mar, 2016 1 commit
  4. 15 Mar, 2016 3 commits
  5. 14 Mar, 2016 7 commits
  6. 10 Mar, 2016 1 commit
  7. 09 Mar, 2016 4 commits
  8. 08 Mar, 2016 3 commits
  9. 07 Mar, 2016 4 commits
  10. 03 Mar, 2016 3 commits
  11. 02 Mar, 2016 3 commits
  12. 01 Mar, 2016 5 commits