diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-09 19:02:29 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-09 19:02:29 -0500 |
| commit | 686fe47b8892d3c3cd82b77b77adf3c990a7c160 (patch) | |
| tree | 470f2e7c84a5959f7e51c6c68e2a97a99266e136 /mod/network.php | |
| parent | 68ca29719e6eb168ca3efa2d60026da924a0e03b (diff) | |
| download | volse-hubzilla-686fe47b8892d3c3cd82b77b77adf3c990a7c160.tar.gz volse-hubzilla-686fe47b8892d3c3cd82b77b77adf3c990a7c160.tar.bz2 volse-hubzilla-686fe47b8892d3c3cd82b77b77adf3c990a7c160.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add js to hide nav-menus, when clicked outside
fixes in css
recover contacts total count which got lost
bug #324 - tinymce used for mail even if editplain being used.
bug in check for private email comment to public conversation prevents authenticated visitor from seeing comments that should be allowed
keep tony from talking to himself
* master:
Diffstat (limited to 'mod/network.php')
0 files changed, 0 insertions, 0 deletions