From 3ecf1098357618092280b2e7c562a1ef5bf11959 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 7 Apr 2012 16:44:03 -0700
Subject: fix conflicts, add docs example for two buttons on an append

---
 docs/assets/bootstrap.zip | Bin 57364 -> 57396 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'docs/assets/bootstrap.zip')

diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 95241ab82..23fa44936 100644
Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
-- 
cgit v1.2.3