Merge branch 'master' into search
authorErik Haider Forsén <erik@forsen.not>
Sat, 14 Nov 2015 14:30:31 +0000 (15:30 +0100)
committerErik Haider Forsén <erik@forsen.not>
Sat, 14 Nov 2015 14:30:31 +0000 (15:30 +0100)
commit2dfcf8f1529a582528fc9bd8e00ed1665084f7d3
treef6a1410cf2c3be9ab9c58e1c89c0d233a45c80bf
parent20f44e68bd3d29028a8ec0809d413a0328a83672
parent76533018451d5eb3c66e1a01bffa859d040d60fd
Merge branch 'master' into search

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

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