Merge https://github.com/redmatrix/hubzilla into pending_merge

2015-11-03 14:59:43 -08:00
parent 2c299a9f37 9fa771f9fe
commit c1cfcc78fe
9 changed files with 38 additions and 26 deletions
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -1166,7 +1166,6 @@ $(document).ready(function() {
 		numbers       : aStr['t17'],
 	};

-	$(".autotime").timeago();
 	$("#toc").toc();
 });