Jovan Gerodetti 20b20ba613 fix for a wrong merge conflic resolve

2016-01-08 19:45:50 +01:00

..

lib

Merge branch 'gif-improvements'

2016-01-04 23:00:12 +01:00

locales

voice recorder proposal for #190

2016-01-08 19:42:56 +01:00

app.js

Bump to 0.5.2

2015-11-29 21:01:57 +03:00

background.js

Bump to 0.5.2

2015-11-29 21:01:57 +03:00

controllers.js

slight UX improvement

2016-01-08 19:42:56 +01:00

directives_mobile.js

Bump to 0.5.2

2015-11-29 21:01:57 +03:00

directives.js

fix for a wrong merge conflic resolve

2016-01-08 19:45:50 +01:00

filters.js

Fixed last seen time with incorrect timezone selected

2015-12-09 14:43:42 +00:00

init.js

voice recorder proposal for #190

2016-01-08 19:42:56 +01:00

message_composer.js

Bump to 0.5.2

2015-11-29 21:01:57 +03:00

messages_manager.js

Merge branch 'gif-improvements'

2016-01-04 23:00:12 +01:00

services.js

Improved gifs

2016-01-04 22:58:32 +01:00