GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge commit 'origin/0.9.x' into 0.9.x 

Conflicts:
	lib/schema.php
This commit is contained in:
Brenda Wallace 2010-03-07 09:30:07 +13:00
parent e97515c877 ef3b849db0
commit c89ed16d24
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.php.sample
View File

@ -197,7 +197,7 @@ $config['sphinx']['port'] = 3312;
//
// $config['twitterimport']['enabled'] = true;
// Twitter OAuth settings
// Twitter OAuth settings. Documentation is at http://apiwiki.twitter.com/OAuth-FAQ
// $config['twitter']['consumer_key'] = 'YOURKEY';
// $config['twitter']['consumer_secret'] = 'YOURSECRET';