Igor Zhukov 450dc2d537 Merge branch 'master' into message-composer
Conflicts:
	app/js/lib/ng_utils.js
2015-02-05 23:03:04 +03:00
..
2014-12-28 20:54:42 +01:00
WIP
2015-01-30 18:58:01 +03:00
2014-10-26 21:04:08 +03:00
2015-01-19 13:31:27 +03:00
2014-12-31 18:07:27 +01:00
2015-02-05 22:25:18 +03:00
2014-12-31 18:14:16 +01:00
2014-12-31 18:14:16 +01:00
2015-02-05 22:25:18 +03:00