Merge branch 'refactor'. Also marking resources/openpgp*.js files as

binary to make some merge/diffing easier. Conflicts: resources/openpgp.js resources/openpgp.min.js
ppentchev · Jan 15, 2013 · 77974db · 77974db
2 parents 66dd6d9 + 968dca9
commit 77974db
Show file tree

Hide file tree

Showing 9 changed files with 10,425 additions and 10,523 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+resources/openpgp*.js binary