Igor Zhukov 7bc6e36ec6 Merge branch 'material-design'
Conflicts:
	app/css/desktop.css
	app/js/directives.js
	app/partials/desktop/photo_modal.html
	app/partials/desktop/user_modal.html
2014-12-10 23:25:26 -08:00
..
2014-12-10 23:25:26 -08:00
2014-12-10 23:25:26 -08:00
2014-12-10 23:25:26 -08:00
2014-10-26 21:04:08 +03:00
2014-12-10 23:25:26 -08:00
2014-11-27 13:20:13 +00:00
2014-11-14 14:07:58 +03:00
2014-11-20 14:55:04 +03:00
2014-11-27 17:01:32 +00:00
2014-11-27 17:01:32 +00:00
2014-11-18 20:22:59 +03:00