git.ipfire.org Git - thirdparty/bootstrap.git/commit

]> git.ipfire.org Git - thirdparty/bootstrap.git/commit

projects / thirdparty / bootstrap.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0a75e4c ed1bd2b)

author	fat <jacobthornton@gmail.com>
	Tue, 24 Dec 2013 20:50:55 +0000 (12:50 -0800)
committer	fat <jacobthornton@gmail.com>
	Tue, 24 Dec 2013 20:50:55 +0000 (12:50 -0800)
commit	fe7fffe034f8a97aae004351ee46fe9a704a971e
tree	057217fcc2a4dd86ad02f26234d9e5a6784c739f	tree
parent	0a75e4c09b77035e9492006647da8d1900d24f75	commit \| diff
parent	ed1bd2b150dd645c11f92126a12183985ddbbc15	commit \| diff

Merge branch 'slide-event-reset' of git://github.com/Rowno/bootstrap into Rowno-slide-event-reset

Conflicts:
js/tests/unit/carousel.js

dist/js/bootstrap.js	diff1 \|	diff2 \|	blob \| history
dist/js/bootstrap.min.js	diff1 \|	diff2 \|	blob \| history
docs-assets/js/raw-files.js	diff1 \|	\|	blob \| history
js/carousel.js	diff1 \|	diff2 \|	blob \| history
js/tests/unit/carousel.js	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/twbs/bootstrap.git