Merge https://github.com/friendica/red into pending_merge

2014-06-21 16:04:30 -07:00 · 2014-06-21 16:04:30 -07:00 · a175c7dba7
commit a175c7dba7
parent 5968bc7f86 78fd496638
1 changed files with 1 additions and 3 deletions
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@ -173,5 +173,3 @@
 			</ul>
 		</div>
 	</div>
-
-