diff options
| author | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-03-15 11:14:39 (GMT) |
|---|---|---|
| committer | Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> | 2012-03-15 11:14:39 (GMT) |
| commit | 563c2a12f101ff0e95a419729d3663bbe3ab2df1 (patch) | |
| tree | f663ad8c472972ff5edb858e6455a069bf375a9a /public_html | |
| parent | a15713bcbfcb7f232a9ef9470a8935b78fe8f62c (diff) | |
| parent | 78d62915289072290ac0a3c1644ceb6127694699 (diff) | |
| download | kolab-wap-563c2a12f101ff0e95a419729d3663bbe3ab2df1.tar.gz | |
Merge branch 'dev/recipient_policy'
Conflicts:
lib/api/kolab_api_service_form_value.php
Diffstat (limited to 'public_html')
| -rw-r--r-- | public_html/.htaccess | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/public_html/.htaccess b/public_html/.htaccess index e646d2d..b228331 100644 --- a/public_html/.htaccess +++ b/public_html/.htaccess @@ -1,6 +1,6 @@ <IfModule mod_rewrite.c> RewriteEngine on - RewriteBase /rc/admin/public_html + RewriteBase /~vanmeeuwen/kolab-wap/public_html # Rewrite URLs of the form 'x' to the form 'index.php?q=x'. RewriteCond %{REQUEST_FILENAME} !-f |