]> git.uio.no Git - u/erikhf/frm.git/commitdiff
git://git.uio.no / u / erikhf / frm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b486567 9ce2e2a)
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)
* 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


Trivial merge