diff options
| author | Jonne Haß <me@mrzyx.de> | 2013-09-01 21:23:56 +0400 |
|---|---|---|
| committer | Jonne Haß <me@mrzyx.de> | 2013-09-01 21:24:44 +0400 |
| commit | 991a50543988400913def697b897ba772027183f (patch) | |
| tree | dc0b5074dca41cbec60b93b3fdb2f31379ff0573 /config | |
| parent | 99657947a9f37803964c39e1390f5c4bd4afe601 (diff) | |
| parent | a4ce4404ff0135912a6fda1629525c9fe7230887 (diff) | |
Merge pull request #4485 from colindean/rename_bitcoin_wallet_id
change bitcoin_wallet_id to bitcoin_address
Diffstat (limited to 'config')
| -rw-r--r-- | config/defaults.yml | 2 | ||||
| -rw-r--r-- | config/diaspora.yml.example | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config/defaults.yml b/config/defaults.yml index c8f8cfd43..9b319045a 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -58,7 +58,7 @@ defaults: open: true count: 25 paypal_hosted_button_id: - bitcoin_wallet_id: + bitcoin_address: community_spotlight: enable: false suggest_email: diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example index 6b34c472f..83512a337 100644 --- a/config/diaspora.yml.example +++ b/config/diaspora.yml.example @@ -233,9 +233,9 @@ configuration: ## Section #paypal_hosted_button_id: "" ## Bitcoin donations - ## You can provide the bitcoin address here to kindly ask + ## You can provide a bitcoin address here to kindly ask ## your users for donations to run their pod. - #bitcoin_wallet_id: "" + #bitcoin_address: "" ## Community Spotlight ## The community spotlight gives new users a starting point on who |