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-11-27 17:01:32 +00:00
2014-11-28 15:38:32 +00:00
2014-09-19 16:13:18 +04:00
2014-11-19 17:04:51 +03:00
2014-09-29 22:18:38 +04:00
2014-09-19 16:13:18 +04:00
2014-11-05 21:37:01 +03:00
2014-09-11 17:06:06 +04:00
2014-11-05 21:37:01 +03:00
2014-11-19 17:04:51 +03:00
2014-10-22 16:29:14 +04:00
2014-09-29 22:18:38 +04:00
2014-12-10 23:25:26 -08:00
2014-09-19 13:34:23 +04:00
2014-09-30 00:07:33 +04:00
2014-11-05 21:37:01 +03:00
2014-12-10 23:25:26 -08:00
2014-10-16 00:46:17 +04:00
2014-10-16 00:46:17 +04:00