Commit 4e4346ad authored by Panda Mery's avatar Panda Mery

Merge branch 'master' of https://gitlab.com/evalapply/evalapply.gitlab.io

# Conflicts:
#	site/contact.html
#	site/feed.xml
#	site/feeds/tags/hello.xml
parents 077b5e2e b2799db8
Pipeline #72349521 passed with stage
in 48 seconds