diff options
| author | Felix Favre <gnomus@gnomus.de> | 2014-08-24 15:52:25 +0200 |
|---|---|---|
| committer | Felix Favre <gnomus@gnomus.de> | 2014-08-24 15:52:25 +0200 |
| commit | 4faca9864f80dfd90cba248855602ab7680cab53 (patch) | |
| tree | 9f2d5d76adc7d14e89d51c0073103e9d7ad717f4 /templates/user_myshifts_reset.html | |
| parent | efe853246f99c59e48ac66955b40fb7e09da0a5b (diff) | |
| parent | f9e577352dd31f2846c3a340a1de82dd73961568 (diff) | |
Merge branch 'master' of github.com:planetcyborg/engelsystem
Conflicts:
themes/theme1.scss
Diffstat (limited to 'templates/user_myshifts_reset.html')
| -rw-r--r-- | templates/user_myshifts_reset.html | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/templates/user_myshifts_reset.html b/templates/user_myshifts_reset.html deleted file mode 100644 index 5e28b74a..00000000 --- a/templates/user_myshifts_reset.html +++ /dev/null @@ -1,6 +0,0 @@ -<p class="error"> - Wenn Du Deinen Key zurück setzt, ändert sich der Link zu Deinem iCal- und JSON-Export, sowie zu dem Atom Feed! Du musst diesen dann an allen Stellen, wo Du ihn verwendest aktualisieren. -</p> -<p> - <a href="?p=user_myshifts&reset=ack">Fortfahren »</a> -</p> |