Michael Telatynski deb7ed660c Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff

2017-06-11 23:13:49 +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

Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff

2017-06-11 23:13:49 +01:00

package.json

Merge branch 'master' into develop

2017-06-06 17:48:32 +01:00