diff options
author | marvin-borner@live.com | 2018-04-22 16:54:30 +0200 |
---|---|---|
committer | marvin-borner@live.com | 2018-04-22 16:54:30 +0200 |
commit | 2fdb14bb97e4f2dbf36b632ec891772bebe41b7d (patch) | |
tree | 381a7875540bb210cb86954870c14e8b6465c3ff /main/app/sprinkles/account/templates/pages | |
parent | aad9b3116ce1158bc43c41b1eb6c78fc42d6c038 (diff) | |
parent | 9786120e568278ae8e3af33fc5d86dcc0798f258 (diff) |
Merge branch 'master' of github.com:marvinborner/SocialNetwork
Diffstat (limited to 'main/app/sprinkles/account/templates/pages')
-rw-r--r--[-rwxr-xr-x] | main/app/sprinkles/account/templates/pages/account-settings.html.twig | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | main/app/sprinkles/account/templates/pages/error/compromised.html.twig | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | main/app/sprinkles/account/templates/pages/forgot-password.html.twig | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | main/app/sprinkles/account/templates/pages/register.html.twig | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | main/app/sprinkles/account/templates/pages/resend-verification.html.twig | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | main/app/sprinkles/account/templates/pages/reset-password.html.twig | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | main/app/sprinkles/account/templates/pages/set-password.html.twig | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | main/app/sprinkles/account/templates/pages/sign-in.html.twig | 0 |
8 files changed, 2 insertions, 2 deletions
diff --git a/main/app/sprinkles/account/templates/pages/account-settings.html.twig b/main/app/sprinkles/account/templates/pages/account-settings.html.twig index 61cd3d0..86db3d9 100755..100644 --- a/main/app/sprinkles/account/templates/pages/account-settings.html.twig +++ b/main/app/sprinkles/account/templates/pages/account-settings.html.twig @@ -34,7 +34,7 @@ {% block scripts_page %} <!-- Include validation rules --> <script> - {% include "pages/partials/page.js.twig" %} + {% include "pages/partials/page.js.twig" %} </script> <!-- Include form widgets JS --> @@ -42,4 +42,4 @@ <!-- Include page-specific JS --> {{ assets.js('js/pages/account-settings') | raw }} -{% endblock %} +{% endblock %}
\ No newline at end of file diff --git a/main/app/sprinkles/account/templates/pages/error/compromised.html.twig b/main/app/sprinkles/account/templates/pages/error/compromised.html.twig index 6048619..6048619 100755..100644 --- a/main/app/sprinkles/account/templates/pages/error/compromised.html.twig +++ b/main/app/sprinkles/account/templates/pages/error/compromised.html.twig diff --git a/main/app/sprinkles/account/templates/pages/forgot-password.html.twig b/main/app/sprinkles/account/templates/pages/forgot-password.html.twig index 72b1a2a..72b1a2a 100755..100644 --- a/main/app/sprinkles/account/templates/pages/forgot-password.html.twig +++ b/main/app/sprinkles/account/templates/pages/forgot-password.html.twig diff --git a/main/app/sprinkles/account/templates/pages/register.html.twig b/main/app/sprinkles/account/templates/pages/register.html.twig index bd155ba..bd155ba 100755..100644 --- a/main/app/sprinkles/account/templates/pages/register.html.twig +++ b/main/app/sprinkles/account/templates/pages/register.html.twig diff --git a/main/app/sprinkles/account/templates/pages/resend-verification.html.twig b/main/app/sprinkles/account/templates/pages/resend-verification.html.twig index 627dce0..627dce0 100755..100644 --- a/main/app/sprinkles/account/templates/pages/resend-verification.html.twig +++ b/main/app/sprinkles/account/templates/pages/resend-verification.html.twig diff --git a/main/app/sprinkles/account/templates/pages/reset-password.html.twig b/main/app/sprinkles/account/templates/pages/reset-password.html.twig index 8e3a24a..8e3a24a 100755..100644 --- a/main/app/sprinkles/account/templates/pages/reset-password.html.twig +++ b/main/app/sprinkles/account/templates/pages/reset-password.html.twig diff --git a/main/app/sprinkles/account/templates/pages/set-password.html.twig b/main/app/sprinkles/account/templates/pages/set-password.html.twig index 3c4fe2b..3c4fe2b 100755..100644 --- a/main/app/sprinkles/account/templates/pages/set-password.html.twig +++ b/main/app/sprinkles/account/templates/pages/set-password.html.twig diff --git a/main/app/sprinkles/account/templates/pages/sign-in.html.twig b/main/app/sprinkles/account/templates/pages/sign-in.html.twig index 2fb6e1c..2fb6e1c 100755..100644 --- a/main/app/sprinkles/account/templates/pages/sign-in.html.twig +++ b/main/app/sprinkles/account/templates/pages/sign-in.html.twig |