Merge branch 'navbar' of git.uio.no:u/erikhf/frm into navbar
authorYrjan A. F. Fraschetti <yrjanaff@1x-193-157-251-118.uio.no>
Thu, 26 Nov 2015 09:13:37 +0000 (10:13 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@1x-193-157-251-118.uio.no>
Thu, 26 Nov 2015 09:13:37 +0000 (10:13 +0100)
commitdc4c82576b9d81e77138ac6846cbdb779e7f7d4f
tree21a8a597601fd7115bf817a69c58c04a6fb3bcfa
parent7f3e967429ee895033b73790f3ae6a416483942c
parent33e62f7e651b3c167719e6a70a776c604ae9cede
Merge branch 'navbar' of git.uio.no:u/erikhf/frm into navbar

# Conflicts:
# src/components/navbar/navbar.html
src/components/search/search.html
src/components/search/search.ts