Yarik / artbox-basic | GitLab

Merge branch 'master' of gitlab.artweb.com.ua:yarik.nechyporuk/artbox-core ...

# Conflicts:
#	behaviors/LanguageBehavior.php
#	components/LanguageRequest.php
#	components/LanguageUrlManager.php
#	controllers/SettingsController.php
#	language_instruction.txt
#	models/Feedback.php
#	models/FeedbackSearch.php
#	models/Language.php
#	models/Page.php
#	models/PageLang.php
#	models/PageSearch.php
#	models/User.php
#	widgets/LanguageForm.php
#	widgets/LanguagePicker.php
#	widgets/views/language_form_frame.php
#	widgets/views/view.php

authored

2017-03-14 10:29:13 +0200

.gitignore 59 Bytes

Edit Raw Blame History

main-local.php
params-local.php
test-local.php
settings.php