]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
resolve conflict
authorMark Otto <markdotto@gmail.com>
Tue, 28 Jun 2011 21:30:48 +0000 (14:30 -0700)
committerMark Otto <markdotto@gmail.com>
Tue, 28 Jun 2011 21:30:48 +0000 (14:30 -0700)
commit01c5e74bb3a351feb0c83ff14fb22244647eb82b
tree1d72cf2f382060bc552151dbfe2df1b2647f0d73
parent5949b8e14559464539541ee02f6af4fc2cfe1cbf
parente91a74e8e89240d061478326ad26bd4ffa9ce910
resolve conflict