Michael Telatynski 0788826a71 Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff ...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	electron_app/src/tray.js

2017-06-22 15:04:33 +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 branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff

2017-06-22 15:04:33 +01:00

package.json

v0.11.4

2017-06-22 12:01:05 +01:00