Mentions légales du service
Skip to content
GitLab
Explore
Sign in
vidjil
vidjil
Repository
vidjil
server
web2py
applications
vidjil
controllers
default.py
Find file
Blame
History
Permalink
Merge remote-tracking branch 'origin/rbx.vidjil.org'
· ad58dc25
Mathieu Giraud
authored
Sep 26, 2014
Conflicts: server/web2py/applications/vidjil/controllers/default.py
ad58dc25