Merge branch 'navbar'
authorRoza Moustafa <roza.92m@hotmail.com>
Thu, 19 Nov 2015 19:08:06 +0000 (20:08 +0100)
committerRoza Moustafa <roza.92m@hotmail.com>
Thu, 19 Nov 2015 19:08:06 +0000 (20:08 +0100)
commit27af2a9172f2089db97187cb39bb07a9be408a1e
tree82c8da811ed4bce5249ecb1ed55e7aa24d508f61
parent1a0d2e3522976e34eb3275c0ea32c2698c8ffa68
parent5bc68022409d2e931f0b65d223ebd4466ea5202f
Merge branch 'navbar'

# Conflicts:
# src/components/app.html
# src/components/map/map.ts
# src/components/search/search.ts
src/components/app.html
src/components/search/search.ts