Skip to content

Commit

Permalink
Merge pull request #3 from andreasrs/master
Browse files Browse the repository at this point in the history
Changed about text. Corrected dependency info. Corrected port handlebar
  • Loading branch information
dlmr committed Apr 6, 2016
2 parents ce08ab0 + d956533 commit 737af5f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions template/app/screens/about/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export default class About extends Component {
return (
<div className={styles.main}>
<div className="header">
<h1>Framsia</h1>
<h2>Roc makes this easy!</h2>
<h1>About</h1>
<h2>roc-template-web-app-react</h2>
</div>
<div className="wrapper">
<h4>Roc is an open source project by VG</h4>
Expand Down
2 changes: 1 addition & 1 deletion template/app/screens/start/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default class Start extends Component {

<h4>Stack composition</h4>
<ul>
<li>Document headers: React Helmet ~2.2.0</li>
<li>Document headers: React Helmet ~2.3.1</li>
<li>Views: React ~0.14.0</li>
<li>Routing: React Router ~1.0.0 & Redux Simple Router ~0.0.8</li>
<li>Flux: Redux ~3.0.2 & React-Redux ~4.0.0</li>
Expand Down
2 changes: 1 addition & 1 deletion template/roc.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module.exports = {
settings: {
runtime: {
applicationName: '{{ rocTitleName }}',
port: 3000, // {{ rocPort }}
port: {{ rocPort }},
serve: ['public', 'build/client'],
favicon: 'favicon.png',
},
Expand Down

0 comments on commit 737af5f

Please sign in to comment.