Skip to content
GitLab
Explore
Sign in
This is an archived project. Repository and other project resources are read-only.
thalia
concrexit
Repository
concrexit
website
photos
templates
photos
album.html
Find file
Blame
History
Permalink
Merge branch 'master' into 28-extra-controls-for-photos
· fbb35b96
Joost Rijneveld
authored
Aug 12, 2016
Conflicts: website/photos/models.py website/photos/templates/photos/album.html
fbb35b96