IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into locations

Browse Source
This commit is contained in:
Grzegorz Leoniec 2018-12-08 14:45:16 +01:00 committed by GitHub
commit d1d1b1dfc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -15,7 +15,7 @@ services:
command: yarn run dev command: yarn run dev
environment: environment:
- HOST=0.0.0.0 - HOST=0.0.0.0
- BACKEND_URL=http://backend.127.0.0.1.xip.io:4000 - BACKEND_URL=http://backend:4000
networks: networks:
hc-network: hc-network:

2
styleguide/src/system/components/data-input/Input/Input.vue
View File

@ -13,7 +13,7 @@
iconRight && `ds-input-has-icon-right` iconRight && `ds-input-has-icon-right`
]" ]"
:id="id" :id="id"
:name="model" :name="name"
:type="type" :type="type"
:autofocus="autofocus" :autofocus="autofocus"
:placeholder="placeholder" :placeholder="placeholder"