Merge branch 'feature/softchroot' of https://github.com/maxkoryukov/headphones into feature/softchroot

Browse Source

Conflicts:
	.travis.yml
	headphones/config_test.py

...

This commit is contained in:

maxkoryukov

2016-02-03 03:23:06 +05:00

parent 0957d2d957 f8df9c502b

commit 2401fc46ba

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