1. 31 Aug, 2014 1 commit
    • fred's avatar
      Merge branch 'stable-0.9.9' into domainepublic · daf5ffbf
      fred authored
      Conflicts:
      	bureau/admin/main.php
      	bureau/admin/menu.php
      	bureau/admin/menu_adm.php
      	bureau/admin/menu_aide.php
      	bureau/admin/menu_brouteur.php
      	bureau/admin/menu_sql.php
      	bureau/admin/styles/base.css
      	bureau/admin/webmail/index.php
      	debian/alternc.config
      	debian/alternc.postinst
      	src/sqlbackup.sh
      	src/update_domains.sh
      daf5ffbf
  2. 30 Aug, 2014 39 commits