Merge branch 'staging' into 'project-admin'

# Conflicts:
#   src/menu-left.pug
#   src/page-project-profile.pug
#   src/page-project.pug
This commit is contained in:
Jean-Baptiste Pasquier
2019-12-19 13:14:34 +00:00
25 changed files with 515 additions and 552 deletions

View File

@ -31,6 +31,7 @@ script(data-default-context, type="application/ld+json")
| "author": "http://happy-dev.fr/owl/#author",
| "account": "http://happy-dev.fr/owl/#account",
| "jabberID": "foaf:jabberID",
| "picture": "foaf:depiction",
| "firstName": "http://happy-dev.fr/owl/#first_name",
| "lastName": "http://happy-dev.fr/owl/#last_name",
| "isAdmin": "http://happy-dev.fr/owl/#is_admin"