Skip to content

Commit 7c26cc7

Browse files
committed
Merge branch 'release/4.1.1'
2 parents d97e5d9 + 81ed562 commit 7c26cc7

File tree

4 files changed

+4464
-4452
lines changed

4 files changed

+4464
-4452
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,12 @@ console.log(decryptedData); // [{id: 1}, {id: 2}]
212212

213213
## Release notes
214214

215+
### 4.1.1
216+
217+
Fix module order in bundled release.
218+
219+
Include the browser field in the released package.json.
220+
215221
### 4.1.0
216222

217223
Added url safe variant of base64 encoding. [357](https://github.com/brix/crypto-js/pull/357)

bower.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "crypto-js",
3-
"version": "4.1.0",
3+
"version": "4.1.1",
44
"description": "JavaScript library of crypto standards.",
55
"license": "MIT",
66
"homepage": "http://github.com/brix/crypto-js",
@@ -32,5 +32,8 @@
3232
],
3333
"main": "index.js",
3434
"dependencies": {},
35+
"browser": {
36+
"crypto": false
37+
},
3538
"ignore": []
3639
}

0 commit comments

Comments
 (0)