Mercurial > dive4elements > website
comparison feed.html @ 57:5d4b8372729e
Merged.
| author | Ariane Broermann <ariane@intevation.de> |
|---|---|
| date | Tue, 25 Mar 2014 11:08:03 +0100 |
| parents | 0e464c5a657c |
| children | 85f26aa10747 |
comparison
equal
deleted
inserted
replaced
| 56:d72e08246c51 | 57:5d4b8372729e |
|---|---|
| 1 <div class="col-xs-6 col-md-4 sidebar-dive4elements"> | 1 <div class="col-xs-6 col-md-4 sidebar-dive4elements"> |
| 2 <div class="news feed"> | 2 <div class="news feed"> |
| 3 <p>News Feed</p> | 3 <p>News Feed</p> |
| 4 <!--#exec cgi="newsfeed.py" --> | 4 <!--#exec "./nf.py" --> |
| 5 </div><!-- /news feed --> | 5 </div><!-- /news feed --> |
| 6 </div><!-- /col-xs-6 --> | 6 </div><!-- /col-xs-6 --> |