diff options
| author | mbi <knox@users.noreply.github.com> | 2015-12-30 10:34:42 +0100 |
|---|---|---|
| committer | mbi <knox@users.noreply.github.com> | 2015-12-30 10:34:42 +0100 |
| commit | 63974992f9a0244df0bbff891956deec7d35904b (patch) | |
| tree | a4152551e4a4366957e06572cf04e4e0e941f38f /bower.json | |
| parent | 1aff941be6ea3c09e86e234b7e2dc77fe4aa3696 (diff) | |
| parent | 45c41e2b2cefa97c9d8c3bc73cfc088839640d1d (diff) | |
| download | nextcloud-server-63974992f9a0244df0bbff891956deec7d35904b.tar.gz nextcloud-server-63974992f9a0244df0bbff891956deec7d35904b.zip | |
Merge branch 'master' into master
Diffstat (limited to 'bower.json')
| -rw-r--r-- | bower.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bower.json b/bower.json index eb8d1ce0b7f..ae9575249c9 100644 --- a/bower.json +++ b/bower.json @@ -29,6 +29,7 @@ "bootstrap": "~3.3.6", "backbone": "~1.2.3", "davclient.js": "https://github.com/evert/davclient.js.git", - "es6-promise": "https://github.com/jakearchibald/es6-promise.git#~2.3.0" + "es6-promise": "https://github.com/jakearchibald/es6-promise.git#~2.3.0", + "base64": "~0.3.0" } } |