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-06-14 00:19:17 +04:00
2014-12-10 23:25:26 -08:00
2014-01-05 20:07:11 +04:00
2014-09-30 15:37:04 +04:00
2014-09-30 15:37:04 +04:00
2014-07-25 18:54:23 +04:00
2014-07-25 18:54:23 +04:00
2014-01-23 19:30:03 +04:00
2014-06-06 19:02:12 +04:00
2014-09-17 14:13:26 +04:00
2014-09-17 14:13:26 +04:00
2014-07-25 15:23:29 +04:00
2014-07-23 20:34:13 +04:00
2014-12-10 23:25:26 -08:00