]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'KyleMit/add-default-settings-documentation'
authorChris Rebert <code@rebertia.com>
Mon, 4 Aug 2014 16:08:07 +0000 (09:08 -0700)
committerChris Rebert <code@rebertia.com>
Mon, 4 Aug 2014 16:08:07 +0000 (09:08 -0700)

Trivial merge