Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into dependencies.io-upd…
Browse files Browse the repository at this point in the history
…ate-build-340.0.0
  • Loading branch information
Leonya committed Aug 20, 2018
2 parents 27a2c36 + 30b5819 commit 017ff06
Show file tree
Hide file tree
Showing 9 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jetbrains/ring-ui",
"version": "1.0.0-beta.165",
"version": "1.0.0-beta.166",
"description": "JetBrains UI library",
"author": "JetBrains",
"license": "Apache-2.0",
Expand Down Expand Up @@ -92,7 +92,7 @@
},
"devDependencies": {
"@jetbrains/eslint-config": "4.0.3",
"@jetbrains/generator-ring-ui": "^1.0.0-beta.165",
"@jetbrains/generator-ring-ui": "^1.0.0-beta.166",
"@jetbrains/stylelint-config": "^1.3.4",
"angular": "1.7.3",
"angular-mocks": "1.7.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ring-ui/docs",
"version": "0.1.15-beta.24",
"version": "0.1.15-beta.25",
"description": "Docs site for Ring UI library",
"author": "JetBrains",
"license": "Apache-2.0",
Expand All @@ -23,7 +23,7 @@
"start": "node --max_old_space_size=2000 ./node_modules/.bin/webpack-dev-server --env.server --disable-host-check"
},
"devDependencies": {
"@jetbrains/ring-ui": "^1.0.0-beta.165",
"@jetbrains/ring-ui": "^1.0.0-beta.166",
"extract-text-webpack-plugin": "2.1.2",
"webpack": "2.7.0",
"webpack-dev-server": "2.11.2"
Expand Down
Binary file modified packages/gemini/gemini/screens/Button Ng/buttons/chrome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/gemini/gemini/screens/Button Ng/buttons/edge.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/gemini/gemini/screens/Button Ng/buttons/firefox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/gemini/gemini/screens/Button Ng/buttons/ie.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/gemini/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ring-ui/gemini",
"version": "0.2.1-beta.21",
"version": "0.2.1-beta.22",
"description": "Gemini tests runner for Ring UI library",
"author": "JetBrains",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jetbrains/generator-ring-ui",
"version": "1.0.0-beta.165",
"version": "1.0.0-beta.166",
"description": "Generator for Ring UI frontend apps",
"author": "JetBrains",
"license": "Apache-2.0",
Expand All @@ -25,7 +25,7 @@
"yeoman-option-or-prompt": "^2.0.0"
},
"devDependencies": {
"@jetbrains/ring-ui": "^1.0.0-beta.165",
"@jetbrains/ring-ui": "^1.0.0-beta.166",
"yo": "2.0.5"
}
}

0 comments on commit 017ff06

Please sign in to comment.