Changeset 5014 for trunk/include/config_default.inc.php
- Timestamp:
- Mar 1, 2010, 5:22:34 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include
- Property svn:mergeinfo changed (with no actual effect on merging)
-
trunk/include/config_default.inc.php
- Property svn:mergeinfo changed
/branches/2.0/include/config_default.inc.php merged: 5013
r4985 r5014 760 760 // or other plugin variables etc 761 761 $conf['local_data_dir'] = dirname(dirname(__FILE__)).'/_data'; 762 763 // where should the API add photos? 764 $conf['upload_dir'] = PHPWG_ROOT_PATH.'upload'; 762 765 ?> - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.