Merge remote-tracking branch 'origin/master'
# Conflicts: # README.md
This commit is contained in:
commit
6ead8e42ff
|
@ -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
|
||||||
|
|
Reference in New Issue