Keep origin in track

author Andreas Cederström <andreas@klydd.se>

Fri, 17 Feb 2012 12:31:36 +0000 (13:31 +0100)

committer Andreas Cederström <andreas@klydd.se>

Fri, 17 Feb 2012 12:31:36 +0000 (13:31 +0100)
author Andreas Cederström <andreas@klydd.se>
Fri, 17 Feb 2012 12:31:36 +0000 (13:31 +0100)
committer Andreas Cederström <andreas@klydd.se>
Fri, 17 Feb 2012 12:31:36 +0000 (13:31 +0100)
diff --cc docs/assets/bootstrap.zip

index 4a9a9eba5adb4542dc7963104c94d010e65040c8,622ad011771c545029eb476904a4a9c58a5490e8..26436c0a2d6689fe2fa67c859f436b647b8a79ab

Binary files differ
diff --cc docs/assets/css/bootstrap.css
Simple merge
diff --cc docs/components.html
Simple merge
diff --cc docs/templates/pages/components.mustache
Simple merge
diff --cc less/buttons.less
Simple merge
author	Andreas Cederström <andreas@klydd.se>
	Fri, 17 Feb 2012 12:31:36 +0000 (13:31 +0100)
committer	Andreas Cederström <andreas@klydd.se>
	Fri, 17 Feb 2012 12:31:36 +0000 (13:31 +0100)
		1	2
docs/assets/bootstrap.zip	patch \|	diff1 \|	diff2 \|	blob \| history
docs/assets/css/bootstrap.css	patch \|	diff1 \|	diff2 \|	blob \| history
docs/components.html	patch \|	diff1 \|	diff2 \|	blob \| history
docs/templates/pages/components.mustache	patch \|	diff1 \|	diff2 \|	blob \| history
less/buttons.less	patch \|	diff1 \|	diff2 \|	blob \| history