1
0

Merge remote-tracking branch 'www.mikescher.de/master'

Conflicts:
	www/protected/views/msmain/admin.php
This commit is contained in:
2014-07-20 21:31:48 +02:00
5 changed files with 272 additions and 2 deletions

View File

@@ -30,6 +30,7 @@ return ArrayX::merge(
'import' =>
[
'application.models.*',
'application.extensions.*',
'application.components.*',
'application.components.widgets.*',
'application.components.extendedGitGraph.*',
@@ -132,6 +133,10 @@ return ArrayX::merge(
[
'tablePrefix' => 'ms4_',
],
'counter' => array(
'class' => 'UserCounter',
),
],
// application-level parameters that can be accessed