Skip to content

Commit

Permalink
Merge branch 'feature/hf/nutrition' into feature/healthfitness
Browse files Browse the repository at this point in the history
  • Loading branch information
grgar committed May 28, 2013
2 parents 0d91e7b + 3a6a144 commit a3fef7f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -1674,7 +1674,7 @@ <h4>Ingredients list</h4>
<div data-role="footer" data-theme="d" style="padding:.5em;">
<a href="#" style="margin-left:auto;margin-right:auto;width:70%;" data-rel="back" data-role="button" data-iconpos="left" data-inline="false" data-icon="arrow-l" data-theme="l">Back</a>
</div><!-- /footer -->
</div><!-- /page 2 -->
</div><!-- /subpage 2 -->

<!-- !Start of thirteenth page: #coreconditioningcorestability -->
<div data-role="page" id="coreconditioningcorestability" data-add-back-btn="true">
Expand Down

0 comments on commit a3fef7f

Please sign in to comment.