diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-06-01 23:13:24 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-06-01 23:13:24 -0400 |
| commit | 8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6 (patch) | |
| tree | 1f850dfb657ddf52a4bf7fe036f81a1d911cfb64 /include/conversation.php | |
| parent | b1dacd6d838ecf75fe828279e57c2e7a866be22f (diff) | |
| parent | 0165d5dd2c8b12a71395cc881910974ddcbaf3fa (diff) | |
| download | volse-hubzilla-8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6.tar.gz volse-hubzilla-8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6.tar.bz2 volse-hubzilla-8503a0e4cc4a5e01d8a30b4a827524d1bf313fc6.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
registration issue after re-factor
install: fix bug #436 and small typo Function check_htaccess() don't perform check if curl is not installed. This was leading to wsod beacuse check_htaccess() uses fetch_url().
admin: remove update link in admin menu
* master:
Diffstat (limited to 'include/conversation.php')
0 files changed, 0 insertions, 0 deletions