KostyaDanovsky 8e8d542e07 Merge remote-tracking branch 'origin/v2' into v2 ... # Conflicts: # src/app/theme/components/sidebar/SidebarCtrl.js		2016-01-13 18:29:50 +03:00
..
app	Merge remote-tracking branch 'origin/v2' into v2	2016-01-13 18:29:50 +03:00
assets	refactor(timeline): remove old icons	2016-01-12 16:52:09 +03:00
sass	refactor(mail):apply code review notes, fix compose area height(add scroll)	2016-01-13 16:52:01 +03:00
404.html	fix(authPages): add separeted gulp tasks for separated pages	2016-01-12 19:35:53 +03:00
auth.html	fix(authPages): add separeted gulp tasks for separated pages	2016-01-12 19:35:53 +03:00
index.html	feat(blurPanel): refactor panels	2015-12-24 18:43:46 +03:00
reg.html	fix(authPages): add separeted gulp tasks for separated pages	2016-01-12 19:35:53 +03:00