Merge branch 'sidebar'
authorErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 26 Nov 2015 09:20:21 +0000 (10:20 +0100)
committerErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 26 Nov 2015 09:20:21 +0000 (10:20 +0100)
commit53aa509840e8f81e734c5026f7975da84ca00591
tree5a0e8c7014bcca8783da33cbf5037433b4ac235f
parentb486567ff4fcde700343061e005d3dcfa174d957
parent9ce2e2a970202e190b2b9b6c839bec083497414c
Merge branch 'sidebar'

* sidebar:
  [sidebar] template for showing and editing a organization unit
  [sidebar] Showing basic information on side panel
  [sidebar] Skeleton up

# Conflicts:
# src/components/app.html
# src/components/app.ts
# src/components/sidebar/sidebar.html
# src/components/sidebar/sidebar.ts