Merge branch 'master' of git.uio.no:u/erikhf/frm master
authorRoza Moustafa <roza.92m@hotmail.com>
Sun, 13 Dec 2015 10:16:40 +0000 (11:16 +0100)
committerRoza Moustafa <roza.92m@hotmail.com>
Sun, 13 Dec 2015 10:16:40 +0000 (11:16 +0100)
1  2 
src/components/search/search.html
src/components/search/search.ts

Simple merge
Simple merge