Delete database.yml
Delete database.yml
Merge branch 'master' of github.com:balticit/template into stage
test_for_menu
newmenu
pravka_newmenu
probels
pravaka+test
pravka
pravka
pravka_probel
Merge pull request #1 from medeiva/master

Тест для меню
Merge pull request #2 from balticit/master

master -> stage
Update _menu.html.erb
Merge branch 'stage' of github.com:balticit/template
fix localization
update active admin