KostyaDanovsky 30bc596a3b Merge remote-tracking branch 'origin/v2' into v2 ... # Conflicts: # src/app/pages/pages.module.js # src/app/theme/components/contentTop/contentTop.directive.js # src/app/theme/components/sidebar/SidebarCtrl.js		2016-01-12 18:33:37 +03:00
..
tree.html	refactor(treeView): redisign	2016-01-12 12:50:01 +03:00
tree.module.js	refactor(basic structure): configure page states, generate sidebar from these states	2016-01-12 18:30:32 +03:00
treeCtrl.js	refactor(treeView): remove old tree lib from module	2016-01-12 14:41:06 +03:00