diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-19 18:53:57 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-19 18:53:57 -0400 |
| commit | f48de791813a914d7ce2e1ec00ba041657f3f8ac (patch) | |
| tree | 734bc402eda120208185b6d24d2618685e830cc4 /include | |
| parent | 4484bd0e9736c2ba86900120012b779d51a39df6 (diff) | |
| download | volse-hubzilla-f48de791813a914d7ce2e1ec00ba041657f3f8ac.tar.gz volse-hubzilla-f48de791813a914d7ce2e1ec00ba041657f3f8ac.tar.bz2 volse-hubzilla-f48de791813a914d7ce2e1ec00ba041657f3f8ac.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
Darkzero, another missing part of "everything"
Diabook-dark - some more cleaning up
Okay, so maybe not *everything*
Give Darkzero some loving.
backend support for 'x' deliveries per process - x is configurable, more importantly any search starting with # is automatically a tag search. TODO: Need to extend this to people searches starting with @
sql script to ccnvert all tables to innodb
* master:
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions