Merge branch 'develop' into 'master'

fix bio melanie

See merge request devfest-toulouse/site-devfest-2019!98
remotes/1693055039339581669/master
Igor Laborie 5 years ago
commit 1f77476f01
  1. 6
      data/slots.yml
  2. 2
      static/api/site.json

@ -173,8 +173,8 @@
start: 42
end: 45
- key: party
start: '19:00'
start: '19:30'
duration: 240
row:
start: 45
end: 47
start: 46
end: 48

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save