Merge remote-tracking branch...
Merge remote-tracking branch 'refs/remotes/afi/dev_#15526_google_var_to_generic_var' into afi-master Conflicts: cosmogramme/php/_init.php
Showing
- VERSIONS_WIP/dev_#15526 1 addition, 0 deletionsVERSIONS_WIP/dev_#15526
- application/modules/admin/controllers/IndexController.php 1 addition, 1 deletionapplication/modules/admin/controllers/IndexController.php
- application/modules/admin/views/scripts/index/adminvar.phtml 1 addition, 1 deletionapplication/modules/admin/views/scripts/index/adminvar.phtml
- application/modules/opac/views/scripts/footer.phtml 1 addition, 1 deletionapplication/modules/opac/views/scripts/footer.phtml
- cosmogramme/php/_init.php 2 additions, 2 deletionscosmogramme/php/_init.php
- cosmogramme/sql/patch/patch_217.php 29 additions, 0 deletionscosmogramme/sql/patch/patch_217.php
- library/Class/AdminVar.php 3 additions, 3 deletionslibrary/Class/AdminVar.php
- library/storm 1 addition, 1 deletionlibrary/storm
- public/opac/skins/responsive/html/footer.phtml 1 addition, 1 deletionpublic/opac/skins/responsive/html/footer.phtml
- tests/application/modules/AbstractControllerTestCase.php 1 addition, 1 deletiontests/application/modules/AbstractControllerTestCase.php
- tests/library/Class/AdminVarTest.php 2 additions, 2 deletionstests/library/Class/AdminVarTest.php
- tests/library/Class/UsersTest.php 20 additions, 20 deletionstests/library/Class/UsersTest.php
- tests/library/Class/WebService/WebAnalyticsClientTest.php 3 additions, 3 deletionstests/library/Class/WebService/WebAnalyticsClientTest.php
Please register or sign in to comment