diff options
| author | Chris Slamar <chris@slamar.org> | 2010-12-30 20:11:53 -0600 |
|---|---|---|
| committer | Chris Slamar <chris@slamar.org> | 2010-12-30 20:11:53 -0600 |
| commit | 15c35ff741c0085ad8f2222440f8a1d5a93b63f8 (patch) | |
| tree | d3d0d91313f455e95f647a48b18f256292628628 /config | |
| parent | b74175b7e663e8996f75ae5e24d649b78c834e46 (diff) | |
| parent | ef8721bedb75900d9c79d446ea7a7665a6b6e674 (diff) | |
| download | ampache-15c35ff741c0085ad8f2222440f8a1d5a93b63f8.tar.gz ampache-15c35ff741c0085ad8f2222440f8a1d5a93b63f8.tar.bz2 ampache-15c35ff741c0085ad8f2222440f8a1d5a93b63f8.zip | |
Merge commit 'refs/merge-requests/4' of git://gitorious.org/ampache/ampache into integration
Diffstat (limited to 'config')
| -rw-r--r-- | config/.gitignore | 1 | ||||
| -rw-r--r-- | config/ampache.cfg.php.dist | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/config/.gitignore b/config/.gitignore new file mode 100644 index 00000000..654ab29b --- /dev/null +++ b/config/.gitignore @@ -0,0 +1 @@ +ampache.cfg.php diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist index fce5218f..d862fc19 100644 --- a/config/ampache.cfg.php.dist +++ b/config/ampache.cfg.php.dist @@ -617,3 +617,8 @@ use_rss = true ; SMTP Password ; your mail auth password. ;mail_auth_pass = "" + +; Twitter +twitter = true +twitter_consumer_key = "tCCFlruiduHyUuC2vNQEyQ" +twitter_consumer_secret = "omRMNdRNktRIqxJVm2uTDyN5iDTUF6Q8eBoinTNgI" |