Merge remote-tracking branch 'origin/master'

# Conflicts:
#	README.md
This commit is contained in:
koenemann 2016-11-14 10:43:06 +01:00
commit 6ead8e42ff
1 changed files with 1 additions and 1 deletions

View File

@ -20,7 +20,7 @@ UnderStrap is released under the terms of the GPL version 2 or (at your option)
http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html http://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html
## Changelog ## Changelog
See [Changelog](CHNAGELOG.md) See [a relative link](CHNAGELOG.md)
## Basic Features ## Basic Features