Commit f13927f8 authored by Oliver Falk's avatar Oliver Falk

Merge branch 'devel' into 'master'

Merge in latest devel

Closes #65

See merge request !172
parents c5eeda57 30991b4b
Pipeline #1979 passed with stages
in 8 minutes and 22 seconds
......@@ -100,7 +100,7 @@ urlpatterns = [ # pylint: disable=invalid-name
r'import_photo/$',
ImportPhotoView.as_view(), name='import_photo'),
url(
r'import_photo/(?P<email_addr>[\w.]+@[\w.]+.[\w.]+)',
r'import_photo/(?P<email_addr>[\w.+-]+@[\w.]+.[\w.]+)',
ImportPhotoView.as_view(), name='import_photo'),
url(
r'import_photo/(?P<email_id>\d+)',
......
......@@ -670,7 +670,7 @@ color:#335ECF;
}
footer {
height: 8rem;
position: absolute;
position: relative;
bottom: 0;
}
footer .container {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment