merge madness

This commit is contained in:
friendica
2014-10-19 16:12:05 -07:00
parent 6d3619c8b1
commit bae3029c63
64 changed files with 1261 additions and 1337 deletions

View File

@@ -100,4 +100,6 @@ This document assumes you're an administrator.
the main logs as well.
[b]system > hide_in_statistics[/b]
Tell the red statistics servers to completely hide this hub in hub lists.
#include doc/macros/main_footer.bb;