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
..
app.css	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
desktop.css	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00
mobile.css	Merge branch 'material-design'	2014-12-10 23:25:26 -08:00