merges master into branch

2018-09-28 17:07:27 +02:00
parent b09cd01cd5 fb5a51621f
commit d87727b449
41 changed files with 1322 additions and 165 deletions
@@ -43,6 +43,8 @@ export const sex = {
  patch: 'Patch',
  ring: 'Ring',
  implant: 'Implant',
+  diaphragm: 'Diaphragm',
+  none: 'None',
  other: 'Other',
  activityExplainer: 'Were you sexually active today?',
  contraceptiveExplainer: 'Did you use contraceptives?'