Skip to content

Commit a4785eb

Browse files
authored
Merge pull request #509 from UniversityOfHelsinkiCS/trunk
minor updates
2 parents 3f6dd66 + e9804ab commit a4785eb

File tree

8 files changed

+1662
-1034
lines changed

8 files changed

+1662
-1034
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ I have:
1010
- [ ] documented the code or added documentation to the wiki.
1111
- [ ] added or modified test(s).
1212
- [ ] test(s) that actually pass.
13-
- [ ] works in dev branch <!-- remove this line if your PR is not against master -->
13+
- [ ] works in trunk branch <!-- remove this line if your PR is not against master -->

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ cache:
77

88
notifications:
99
email: false
10-
slack:
11-
secure: otVal+5p4efIi1Ms8lWV64WrAJN22cBjYy/ZLL7ufzoup3ibEcyxuDRDh/0iyUU8BVbyXTJSZsnSPjQHjmCAh0l+BaXAXmr+fMIYXbYr98uPSNReWCadWiDyW2+hbDylz845d6qX0qaMQ0OVc4QPwcanI42h5qTfTjcPc/1PkpIxoNWJM/wcEbdiXk66vOBagkZD46aRxehvAi8f+EEcMNUb5k2BoZDMb/pVKGSRRGHO9uJ1sYzxgFQKmDHgRores/UAfUOr0xnU8X9k3FZ2VqKgxjaLtMiqHDiABUtQblEEXEKspjifonMxc974hgkQwWQ/PvKZhnzatPLKTLjL5tcMXfGxfnznJpIRUBm17H5aGRt8cR/ba9SlCzGKQu5WLXZ+VE6acXgdFjhmkvmp+ESBjZ312F9hKmy2/A8VKJMpZs2W9Nu05HB+1+l6fLkQNCFkCzhAg9xA1aaihyNdPCd6GDarqE26YGL5auN4n/tlajLxUAEN2GxixxRk4e17PFor24xe8tYbp5X1knFFVSiQcUKpItJooDDqBFEkDy7uDk1Tyc4w1/mClQX2gwwUnPmVKeJ4e7E30/4iZsR4xlI8OSL4mc2DIbo4GslGFaf0Bmexku68qJHL0gegw8XNtNr2L+JG0zVbre0r6r0uvrue3tptohPTVKyGngFAq5g=
1210
language: node_js
1311
node_js:
1412
- '8'

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:8-wheezy
1+
FROM node:8
22
ADD ./labtool2.0 /code
33
WORKDIR /code
44
COPY ./labtool2.0/package.json ../

backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:8-wheezy
1+
FROM node:8
22
ADD ./ /code
33
WORKDIR /code
44
COPY ./package.json ./

0 commit comments

Comments
 (0)