Igor Zhukov 450dc2d537 Merge branch 'master' into message-composer ...

Conflicts:
	app/js/lib/ng_utils.js

2015-02-05 23:03:04 +03:00

..

app.css

Merge branch 'master' into message-composer

2015-02-05 23:03:04 +03:00

desktop.css

Merge branch 'master' into message-composer

2015-02-05 23:03:04 +03:00

font.css

disabled own fonts

2014-12-28 20:54:42 +01:00

mobile.css

Make it work

2015-02-05 22:25:18 +03:00