Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Pyrax committed Aug 24, 2015
2 parents 5ac7474 + ceb64a4 commit f6a70d8
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions templates/old_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -826,6 +826,10 @@ <h3>Newsletter</h3>
<p class="source link">
<a href="http://theproblemsolver.nl/TheReactNewsletter/Subscribe" target="_blank">The React Newsletter</a>
</p>

<p class="source link">
<a href="http://ng-newsletter.com/" target="_blank">ng-newsletter</a>
</p>
</div>
</div>
</section>
Expand Down

0 comments on commit f6a70d8

Please sign in to comment.