Merge branch 'master' into search
authorErik Haider Forsén <erik@forsen.not>
Sat, 14 Nov 2015 13:04:45 +0000 (14:04 +0100)
committerErik Haider Forsén <erik@forsen.not>
Sat, 14 Nov 2015 13:04:45 +0000 (14:04 +0100)
commit20f44e68bd3d29028a8ec0809d413a0328a83672
treec8ae1fe3b8bc73dfff101a1f71de230b8dab70a5
parent0251c7ba0ab23dc328b3de6a27463433bc23dbdd
parentaca80f6a97807505358ebe0d62d58e3de67252c3
Merge branch 'master' into search

* master:
  [apiService] created a service for getting the API URL

# Conflicts:
# src/components/app.ts
# src/index.html
src/components/app.ts
src/index.html