summaryrefslogtreecommitdiffhomepage
path: root/package.json
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2018-06-27 17:49:38 +0200
committerAndrej Mihajlov <and@mullvad.net>2018-06-27 17:49:38 +0200
commit3f1b105ae1a290db79da61f47c277a224b32031d (patch)
treefaa5a55631a3fc727df37586f6834a1d5d01cbc5 /package.json
parentf41f3bbfda0abd6db1ef0ee0eeddd155f41cdb3a (diff)
parent729dc6a3b9dd9fca84c355ef4b0c321cd344745b (diff)
downloadmullvadvpn-3f1b105ae1a290db79da61f47c277a224b32031d.tar.xz
mullvadvpn-3f1b105ae1a290db79da61f47c277a224b32031d.zip
Merge branch 'activation-state-observer'
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index 7c8fd80de6..d6651459dc 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
"react-router": "^4.2.0",
"react-router-redux": "^5.0.0-alpha.9",
"react-simple-maps": "^0.10.1",
- "reactxp": "1.3.0-rc.0",
+ "reactxp": "1.3.0-rc.6",
"redux": "^3.0.0",
"redux-thunk": "^2.2.0",
"uuid": "^3.0.1",