aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/mod_directory.js
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-23 17:30:35 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-23 17:30:35 -0700
commit833098e3460e0a2c7fbffaa59163af815f419e68 (patch)
treeb13bc70bf34288659be12c64ab7a5ed0ce131dd2 /view/js/mod_directory.js
parentae6612025dcd31349056364d0c701bfda58470db (diff)
parent7975bc828fc9ae1cf9b92cc2147297a46524d59f (diff)
downloadvolse-hubzilla-833098e3460e0a2c7fbffaa59163af815f419e68.tar.gz
volse-hubzilla-833098e3460e0a2c7fbffaa59163af815f419e68.tar.bz2
volse-hubzilla-833098e3460e0a2c7fbffaa59163af815f419e68.zip
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts: include/items.php mod/item.php
Diffstat (limited to 'view/js/mod_directory.js')
-rw-r--r--view/js/mod_directory.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/view/js/mod_directory.js b/view/js/mod_directory.js
index 90942f9ac..e850963c1 100644
--- a/view/js/mod_directory.js
+++ b/view/js/mod_directory.js
@@ -38,4 +38,4 @@ function postRatings() {
$(document).ready(function() {
collapseHeight();
-}); \ No newline at end of file
+});