Merge branch 'master' into '150-apply-design-to-chart'

# Conflicts: # components/calendar.js # components/chart/y-axis.js
2018-09-14 11:28:38 +00:00
parent 5218e72daf 856de554d2
commit 1e220ef9e3
57 changed files with 2118 additions and 1268 deletions
@@ -182,4 +182,4 @@ export default class DayColumn extends Component {
      </View>
    )
  }
-}
+}