Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
augustinas committed Mar 23, 2018
2 parents 0885420 + e24378f commit 5d3eefd
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Rumpel",
"version": "3.4.1",
"version": "3.4.2",
"license": "MPL-2.0",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export class AppConfig {
}

export const configuration: AppConfig = {
version: '3.4.1',
version: '3.4.2',
name: 'Rumpel',
supportedDomains: ['.hubofallthings.net', '.hat.direct'],
native: environment.native,
Expand Down
2 changes: 1 addition & 1 deletion src/app/user/login-oauth/login-oauth.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export class LoginOauthComponent implements OnInit, OnDestroy {
.subscribe(
(hatApp: HatApplication) => {

if (hatApp.setup && !hatApp.needsUpdating) {
if (hatApp.active && !hatApp.needsUpdating) {
this.buildRedirect(name);
} else {
this.hatApp = hatApp.application;
Expand Down

0 comments on commit 5d3eefd

Please sign in to comment.