diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /libs/minidns/gradle.properties.example | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'libs/minidns/gradle.properties.example')
| -rw-r--r-- | libs/minidns/gradle.properties.example | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libs/minidns/gradle.properties.example b/libs/minidns/gradle.properties.example deleted file mode 100644 index 68ffc418..00000000 --- a/libs/minidns/gradle.properties.example +++ /dev/null @@ -1,21 +0,0 @@ -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# -# GPG settings -# - -# gpg key id -#signing.keyId=DEADBEEF -# the gpg key passphrase -#signing.password=correcthorsebatterystaple -# gpg keyring (this is the default gnupg keyring containing private keys) -#signing.secretKeyRingFile=/home/ubuntu/.gnupg/secring.gpg - -# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # -# -# nexus settings -# - -# the nexus username used for log in -#nexusUsername=ubuntu -# the nexus password -#nexusPassword=correcthorsebatterystaple |