Merge branch '160-improve-gitignore' of https://code.briarproject.org/akwizgran/briar into 160-improve-gitignore

Browse Source

Conflicts:
	.gitignore

...

This commit is contained in:

Ernir Erlingsson

2015-12-09 00:35:50 +01:00

parent 2a61fa94d1 6d07a66063

commit 105b627152

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

Diff Content Not Available