Merge branch 'master' into feature/gollum-lib

Conflicts: lib/gollum/markup.rb
2013-03-19 23:54:27 +00:00
parent 1f79126b27 7a70169d06
commit cbc0821928
2 changed files with 9 additions and 0 deletions
@@ -729,3 +729,6 @@ ul.actions {
  padding: 0.25em;
 }

+.clearfloats {
+  clear: both;
+}