Merge branch 'master' into openpgp

Browse Source

Conflicts:
	.travis.yml

...

This commit is contained in:

James Booth

2015-06-05 23:02:56 +01:00

parent a3693cfbe7 ae4e07ad87

commit 9aff8abd2e

82 changed files with 968 additions and 53 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1025

unittests/test_cmd_account.c Normal file

File diff suppressed because it is too large Load Diff