Changeset [2f5094f3c08c4c0d3cfc88ab2c32713d600b6520] by dogmatic69
Revision 2f5094f3c08c4c0d3cfc88ab2c32713d600b6520,
committed by dogmatic69
· July 6th, 2013 @ 07:02 PM
Merge branch 'dev' of github.com:infinitas/infinitas into dev
Conflicts:
CakePHP
https://github.com/infinitas/infinitas/commit/2f5094f3c08c4c0d3cfc8...
20 changed files
-
M
CakePHP -
M
Core/Comments/View/Elements/modules/comment/module.ctp -
M
Core/Comments/View/Elements/single_comment.ctp -
M
Core/Contents/Controller/Component/GlobalContentsComponent.php -
M
Core/Contents/Model/GlobalLayout.php -
M
Core/Contents/View/Elements/content_form.ctp -
M
Core/Contents/View/Elements/modules/small_search/module.ctp -
M
Core/Contents/View/Helper/TagCloudHelper.php -
M
Core/Filemanager/View/Elements/file_upload.ctp -
M
Core/Filter/View/Helper/FilterHelper.php -
M
Core/Libs/Controller/Component/InfinitasActionsComponent.php -
M
Core/Libs/Controller/Component/InfinitasComponent.php -
M
Core/Libs/View/Helper/DesignHelper.php -
M
Core/Menus/View/Helper/MenuHelper.php -
M
Core/ServerStatus/Controller/ServerStatusController.php -
M
Core/Webmaster/Lib/WebmasterEvents.php -
M
Developer/DebugKit -
M
Plugin/Cms -
M
Plugin/InfinitasPiwik -
M
View/Helper/AppHelper.php