Merge branch 'navbar'
authorYrjan A. F. Fraschetti <yrjanaff@1x-193-157-214-191.uio.no>
Thu, 3 Dec 2015 18:00:16 +0000 (19:00 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@1x-193-157-214-191.uio.no>
Thu, 3 Dec 2015 18:00:16 +0000 (19:00 +0100)
commit272ce7c032f0829face63855ea30b51810d138bd
treee10addb2ac709e282374d8e3060cc5c6f02ee6bc
parentbc2f4c9ee84268b1753008abff851c3f2ab6668c
parent431ff5c5fcbc154e3a4e2a5bb01b01768e7cd14a
Merge branch 'navbar'
Added new features for filtering