Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
TeoTN committed Nov 2, 2017
2 parents d30b5b8 + 625ee87 commit 64f17fb
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/homepage/components/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default class App extends React.Component {
</main>
<div className="filler"/>
<footer className="footer-app">
Carefully crafted by <a href="http://www.piotrstaniow.pl/">Piotr Staniów</a>. [v2.2.0]
Carefully crafted by <a href="http://www.piotrstaniow.pl/">Piotr Staniów</a>. [v2.2.1]
</footer>
</div>
);
Expand Down
1 change: 1 addition & 0 deletions src/shared/auth/auth.reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const auth = (state = {activate: activate()}, action) => {
case REQUEST_SAVE_MEMBER:
case REQUEST_SAVE_PROFILE:
case SETTINGS_SAVED:
case types.WHATS_NEW_SHOWN:
return {
...state,
profile: profile(state.profile, action),
Expand Down
2 changes: 1 addition & 1 deletion src/shared/auth/auth.types.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ export const SET_PROFILE = 'AUTH::SET_PROFILE';
export const ACTIVATE_REQUEST = 'AUTH::ACTIVATE_REQUEST';
export const ACTIVATE_SUCCESS = 'AUTH::ACTIVATE_SUCCESS';
export const ACTIVATE_FAILURE = 'AUTH::ACTIVATE_FAILURE';
export const WHATS_NEW_SHOWN = 'SETTINGS::WHATS_NEW_SHOWN';
export const WHATS_NEW_SHOWN = 'AUTH::WHATS_NEW_SHOWN';

0 comments on commit 64f17fb

Please sign in to comment.