fork-openpgpjs/.gitattributes
seancolyer 77974db1a6 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
2013-01-14 20:44:58 -05:00

2 lines
29 B
Plaintext