Igor Zhukov 2dbffb6154 Merge branch 'pr/508' ... Also improved styles for new material design Conflicts: app/css/desktop.css app/partials/desktop/im.html app/vendor/jquery.emojiarea/jquery.emojiarea.js		2015-01-02 15:12:08 +01:00
..
desktop	Merge branch 'pr/508'	2015-01-02 15:12:08 +01:00
mobile	Added sticker view support	2015-01-02 13:31:29 +01:00