David Baker 73ec3e1f4d Merge branch 'master' into develop		2017-05-22 11:44:31 +01:00
..
build	npm is "smart" enough to try and install our electron wrapper as a module	2017-05-10 13:36:27 +01:00
img	npm is "smart" enough to try and install our electron wrapper as a module	2017-05-10 13:36:27 +01:00
riot.im	Add config for riot-bot on desktop app build	2017-05-18 12:00:02 +01:00
src	Merge pull request #3909 from vector-im/t3chguy/favicon_improvements	2017-05-19 16:22:11 +01:00
package.json	v0.9.10	2017-05-22 11:40:10 +01:00