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

@@ -48,5 +48,5 @@ Returns the translated variant of $string for the current language or $string (d
Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set.
If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0;
Return to the [url=[baseurl]/help/main]Main documentation page[/url]
#include doc/macros/main_footer.bb;