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-01-05 20:07:11 +04:00
2014-01-05 20:07:11 +04:00
2014-01-05 20:07:11 +04:00
2014-01-05 20:07:11 +04:00
2014-06-05 23:35:57 +04:00
2014-06-05 23:35:57 +04:00
2014-06-05 23:35:57 +04:00
2014-06-05 23:35:57 +04:00
2014-06-05 23:35:57 +04:00
2014-03-05 01:21:49 +01:00
2014-10-29 21:54:17 +03:00
2014-10-29 21:54:17 +03:00
2014-11-27 13:20:13 +00:00
2014-11-27 13:20:13 +00:00