Christian Lohmann e9584543df Merge branch 'master' into 35-sort-pods ...

# Conflicts:
#	app/src/app.js

2016-12-22 14:35:52 +01:00

..

src

Merge branch 'master' into 35-sort-pods

2016-12-22 14:35:52 +01:00

.eslintrc.yml

#34 added semi rule with "never" option

2016-12-21 13:51:42 +01:00

package.json

added selectbox

2016-12-22 14:33:25 +01:00

webpack.config.js

#34 added semi rule with "never" option

2016-12-21 13:51:42 +01:00