merge
authorJulie Hill Roa <julie.hill.roa@gmail.com>
Sun, 6 Dec 2015 16:46:52 +0000 (17:46 +0100)
committerJulie Hill Roa <julie.hill.roa@gmail.com>
Sun, 6 Dec 2015 16:46:52 +0000 (17:46 +0100)
commit3012b7719a204826e112a0a4cad83ed1e8d4d0c0
tree5315f705194e8e50f59bbb06fdea1416408f45a1
parent4b7e75452972a5e44a24d1d472b411d8cec28387
parent1b8069709c2030c2299af72eedd1cbb75c905e94
merge
src/components/search/search.ts
src/components/sidebar/sidebar.html
src/components/sidebar/sidebar.ts