Skip to content

Commit

Permalink
Merge branch 'crosbymichael-master' into crosbymichael-dist
Browse files Browse the repository at this point in the history
  • Loading branch information
kevana committed Dec 15, 2015
1 parent d4cfa11 commit f9aedad
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions app/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
// You need to set this to the api endpoint without the port i.e. http://192.168.1.9
.constant('DOCKER_ENDPOINT', 'dockerapi')
.constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243
.constant('UI_VERSION', 'v0.8.0')
.constant('DOCKER_API_VERSION', 'v1.20');
.constant('UI_VERSION', 'v0.8.1')
.constant('DOCKER_API_VERSION', 'v1.21');
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "dockerui",
"version": "0.8.0",
"version": "0.8.1",
"homepage": "https://github.com/crosbymichael/dockerui",
"authors": [
"Michael Crosby <crosbymichael@gmail.com>",
Expand Down
4 changes: 2 additions & 2 deletions dist/dockerui.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"author": "Michael Crosby & Kevan Ahlquist",
"name": "dockerui",
"homepage": "https://github.com/crosbymichael/dockerui",
"version": "0.8.0",
"version": "0.8.1",
"repository": {
"type": "git",
"url": "git@github.com:crosbymichael/dockerui.git"
Expand Down

0 comments on commit f9aedad

Please sign in to comment.