Skip to content

Commit

Permalink
Merge branch '_bump-v3.22.1-local' into master-dist
Browse files Browse the repository at this point in the history
  • Loading branch information
patternfly-build committed Mar 2, 2017
2 parents a70073c + 54ece71 commit 66490e2
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "patternfly",
"version": "3.21.0",
"version": "3.22.1",
"authors": "Red Hat",
"license": "Apache-2.0",
"homepage": "https://www.patternfly.org",
Expand Down
2 changes: 1 addition & 1 deletion dist/js/patternfly-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'use strict';

var patternfly = {
version: "3.21.0",
version: "3.22.1",
};

// Util: PatternFly Palette colors
Expand Down
2 changes: 1 addition & 1 deletion dist/js/patternfly-settings.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/patternfly.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'use strict';

var patternfly = {
version: "3.21.0",
version: "3.22.1",
};

// Util: PatternFly Palette colors
Expand Down
2 changes: 1 addition & 1 deletion dist/js/patternfly.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "patternfly",
"version": "3.21.0",
"version": "3.22.1",
"author": "Red Hat",
"license": "Apache-2.0",
"dependencies": {
Expand Down Expand Up @@ -36,7 +36,7 @@
"karma-phantomjs-launcher": "^1.0.1",
"matchdep": "~1.0.1",
"nsp": "^2.6.1",
"patternfly-eng-release": "~3.21.0",
"patternfly-eng-release": "~3.22.1",
"pixrem": "^3.0.1",
"table": "3.7.9"
},
Expand Down
2 changes: 1 addition & 1 deletion src/js/patternfly-settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
'use strict';

var patternfly = {
version: "3.21.0",
version: "3.22.1",
};

// Util: PatternFly Palette colors
Expand Down

0 comments on commit 66490e2

Please sign in to comment.