diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-10-08 06:44:46 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-10-08 06:44:46 +0200 |
| commit | 674048432a697e8ee1d8eaffdde673b31030086d (patch) | |
| tree | fb6d4b82c52c2e2dfef3866f02fe11dc4b34ca7d | |
| parent | 0f377e8041dfb76fbfb34054414fe046590ba390 (diff) | |
| parent | c44d6622ca085d3ed54d7ba1c5664375ec0f4eab (diff) | |
Merge remote branch 'origin/master-da' into master-nbmaster-nb
Conflicts (manually resolved):
templates/pwurl.mdwn
| -rw-r--r-- | templates/mailinglisturl.mdwn | 2 | ||||
| -rw-r--r-- | templates/pwurl.mdwn | 2 | ||||
| -rw-r--r-- | templates/webmailurl.mdwn | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/templates/mailinglisturl.mdwn b/templates/mailinglisturl.mdwn index 4e33c29..3a1b377 100644 --- a/templates/mailinglisturl.mdwn +++ b/templates/mailinglisturl.mdwn @@ -1 +1 @@ -<http://lists.[[!template id=domain]]/> +<http://lists.eksempel.dk/> diff --git a/templates/pwurl.mdwn b/templates/pwurl.mdwn index 803a886..d1e9881 100644 --- a/templates/pwurl.mdwn +++ b/templates/pwurl.mdwn @@ -1 +1 @@ -<https://[[!template id=mailhost]]/pw> +<https://mail.eksempel.dk/pw> diff --git a/templates/webmailurl.mdwn b/templates/webmailurl.mdwn index 29c5e39..5e4a0ee 100644 --- a/templates/webmailurl.mdwn +++ b/templates/webmailurl.mdwn @@ -1 +1 @@ -<https://[[!template id=mailhost]]/> +<https://mail.eksempel.dk/> |