Merge branch 'sidebar'
authorErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 3 Dec 2015 14:12:42 +0000 (15:12 +0100)
committerErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 3 Dec 2015 14:12:42 +0000 (15:12 +0100)
commit33b253bf27a8e65d45d50609085f8b1a0354507a
treeb0bcf9d7dd9025839c227aa6c2c305161c03b9c4
parent526fc285a1e413b99b8dc356f5c757f9cf8e11f4
parent8c91a910022bb476522390b8377a94d2f552cec8
Merge branch 'sidebar'

* sidebar:
  [sidebar] Using model-driven form instead of data-driven form
  [sidebar] Working on adding object
  [sidebar] Functionality to cancel editing
  [sidebar] Update existing organizational unit

# Conflicts:
# src/components/map/map.ts
src/components/map/map.ts