diff options
author | Michael Vogel <icarus@dabo.de> | 2012-04-15 16:49:54 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-04-15 16:49:54 +0200 |
commit | a147d6113c081694d4209002fa5e57106d4c6f41 (patch) | |
tree | de6f940efa0439ab3d54ff7d280e221b7b59d348 /include/config.php | |
parent | e825a73f1de308b6ae0ae3cc5549263704a14594 (diff) | |
parent | f994f9abc6092106659a29f5ee1be0706825c203 (diff) | |
download | volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.gz volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.tar.bz2 volse-hubzilla-a147d6113c081694d4209002fa5e57106d4c6f41.zip |
Merge commit 'upstream/master'
Diffstat (limited to 'include/config.php')
-rw-r--r--[-rwxr-xr-x] | include/config.php | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/include/config.php b/include/config.php index 4cff38090..4cff38090 100755..100644 --- a/include/config.php +++ b/include/config.php |