Merge remote-tracking branch 'cleanflight/development' into GUI-rework

# Conflicts: # tabs/landing.css # tabs/landing.html
2015-11-11 22:27:36 +01:00 · 2015-11-11 22:27:36 +01:00 · 0fce27c817
parent a63e628eac 9037d44f2c
commit 0fce27c817
2 changed files with 2 additions and 2 deletions
--- a/tabs/landing.css
+++ b/tabs/landing.css
@ -246,4 +246,4 @@

 #changelog .log p {
  margin-bottom: 20px;
-}
+}
--- a/tabs/landing.html
+++ b/tabs/landing.html
@ -55,4 +55,4 @@
         </div>
      </div>
   </div>
-</div>
+</div>