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

..

lib

Merge branch 'material-design'

2014-12-10 23:25:26 -08:00

locales

Merge branch 'material-design'

2014-12-10 23:25:26 -08:00

app.js

Bump to 0.3.6

2014-11-27 17:01:32 +00:00

background.js

Bump to 0.3.6

2014-11-27 17:01:32 +00:00

controllers.js

Merge branch 'material-design'

2014-12-10 23:25:26 -08:00

directives_mobile.js

Bump to 0.3.6

2014-11-27 17:01:32 +00:00

directives.js

Merge branch 'material-design'

2014-12-10 23:25:26 -08:00

filters.js

Bump to 0.3.6

2014-11-27 17:01:32 +00:00

i18n.js

Added migrate to HTTPS modal

2014-11-13 15:35:07 +03:00

init.js

Added language for mobile settings

2014-10-02 14:43:56 +04:00

services.js

Merge branch 'material-design'

2014-12-10 23:25:26 -08:00