Michael Telatynski 67a9b6502b Merge branch 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff		2017-06-20 14:33:09 +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	explicit protocol in configs, otherwise breaks in Electron	2017-05-29 19:32:44 +01:00
src	add missing semicolon	2017-06-20 14:05:17 +01:00
package.json	v0.11.3	2017-06-20 13:13:28 +01:00