]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
update readme to resolve conflict
authorMark Otto <otto@github.com>
Sun, 17 Mar 2013 18:45:13 +0000 (11:45 -0700)
committerMark Otto <otto@github.com>
Sun, 17 Mar 2013 18:45:13 +0000 (11:45 -0700)
commit8d5a9371be9c727fefc6299d265475df625bc762
treeb229e430053ace6c9b003bbbfde3ef9d904f0261
parenteb24718add4dd36fe92fdbdb79e6ff4ce5919300
parentba8ba1fe7298a91ee44db6afceb77d82fc711d93
update readme to resolve conflict
README.md