Resolve merge conflicts

2013-07-07 14:58:57 +02:00 · 2013-07-07 14:58:57 +02:00 · a5565b436f
commit a5565b436f
parent 02e2ce4bc3 d397132f7b
18 changed files with 72 additions and 880 deletions
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@ -2,4 +2,4 @@
 *= require bootstrap_and_overrides
 *= require select2
 *= require token-input-bootstrappy
-*/
+*= require bootstrap-datepicker