• fred's avatar
    Merge branch 'stable-1.0' into wip/domainepublic-1.0 · 3c61c6f2
    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_mail.php
    	bureau/admin/menu_sql.php
    	bureau/admin/styles/base.css
    	bureau/admin/webmail/index.php
    	bureau/class/config.php
    	bureau/class/config_real.php
    	bureau/class/functions.php
    	bureau/class/local.php
    	bureau/class/m_admin.php
    	bureau/class/m_dom.php
    	bureau/class/m_mail.php
    	debian/po/fr.po
    	debian/po/templates.pot
    	src/mail_add
    	src/rawstat.daily
    3c61c6f2
Name
Last commit
Last update
.tx Loading commit data...
aide Loading commit data...
bureau Loading commit data...
debian Loading commit data...
etc/alternc Loading commit data...
install Loading commit data...
man Loading commit data...
nightlybuild Loading commit data...
po Loading commit data...
src Loading commit data...
tests Loading commit data...
tools Loading commit data...
.gitattributes Loading commit data...
.gitignore Loading commit data...
.svnignore Loading commit data...
COPYING Loading commit data...
README.en Loading commit data...
README.fr Loading commit data...
dirty_hack_restore_register_globals.php Loading commit data...
quota_delete Loading commit data...
quota_init Loading commit data...