From: Sébastien CHAZALLET <s.chazallet@gmail.com>
Date: Thu, 21 Mar 2013 13:23:26 +0000 (+0100)
Subject: Merge branch 'master' of ../application-blanche
X-Git-Url: http://git.inspyration.org/?p=zf2.biz%2Fgalerie.git;a=commitdiff_plain

Merge branch 'master' of ../application-blanche

Conflicts:
	config/application.config.php
	server_config/site.alias
---

958e917c5c3e93a75a1a4b3aff11ac81b7e99863
diff --cc config/application.config.php
index 1dab349,846b7b7..9f36ab0
--- a/config/application.config.php
+++ b/config/application.config.php
@@@ -2,7 -2,7 +2,8 @@@
  return array(
      'modules' => array(
          'Application',
+         'Auth',
 +        'Galerie',
      ),
      'module_listener_options' => array(
          'config_glob_paths'    => array(