Merge branch 'sidebar'
authorErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 26 Nov 2015 09:51:24 +0000 (10:51 +0100)
committerErik Haider Forsén <erikhf@ifi.uio.no>
Thu, 26 Nov 2015 09:51:24 +0000 (10:51 +0100)
commit684563fc0267a84adf75543574e7b93dcff056f5
treecd5c49457e5eae09653997c8ca4230295137da37
parent53aa509840e8f81e734c5026f7975da84ca00591
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
src/components/app.html
src/components/app.ts