diff options
| author | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-02-19 11:18:34 +0100 |
|---|---|---|
| committer | Marcello Stanisci <marcello.stanisci@inria.fr> | 2016-02-19 11:18:34 +0100 |
| commit | cce5ba991be08b4128a5e34c2b515390f77d30f7 (patch) | |
| tree | 30ae8a9138c06e2f18ff234b741ddc9a910d07ef /src/frontend_blog/articles/scrap1_29.html | |
| parent | 38bc44f67265d8ce56c6c5777097bd60c9f4337c (diff) | |
| parent | 6c15480afe13749d060331bd714ec289d32f022d (diff) | |
| download | merchant-cce5ba991be08b4128a5e34c2b515390f77d30f7.tar.gz merchant-cce5ba991be08b4128a5e34c2b515390f77d30f7.tar.bz2 merchant-cce5ba991be08b4128a5e34c2b515390f77d30f7.zip | |
Merge branch 'master' of ssh://taler.net/var/git/merchant
Conflicts:
src/frontend_blog/articles/fs-essay.html
src/frontend_blog/index.html
Diffstat (limited to 'src/frontend_blog/articles/scrap1_29.html')
| -rw-r--r-- | src/frontend_blog/articles/scrap1_29.html | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/frontend_blog/articles/scrap1_29.html b/src/frontend_blog/articles/scrap1_29.html index 2bdf3756..fc485fb9 100644 --- a/src/frontend_blog/articles/scrap1_29.html +++ b/src/frontend_blog/articles/scrap1_29.html @@ -241,20 +241,5 @@ flexibility for future GPL versions. <a name="index-call-to-action_002c-upgrade-to-GPL-version-3-1"></a> <a name="index-patents_002c-GPL-version-3-and-5"></a> </p><hr size="2"> -<table cellpadding="1" cellspacing="1" border="0"> -<tr><td valign="middle" align="left">[<a href="scrap1_28.html#GPL" title="Previous section in reading order"> < </a>]</td> -<td valign="middle" align="left">[<a href="scrap1_30.html#LGPL" title="Next section in reading order"> > </a>]</td> -<td valign="middle" align="left"> </td> -<td valign="middle" align="left">[Contents]</td> -<td valign="middle" align="left">[<a href="scrap1_U.4.html#Index" title="Index">Index</a>]</td> -<td valign="middle" align="left">[<a href="scrap1_abt.html#SEC_About" title="About (help)"> ? </a>]</td> -</tr></table> -<p> - <font size="-1"> - This document was generated by <em>Christian Grothoff</em> on <em>February 18, 2016</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.82</em></a>. - </font> - <br> - -</p> </body> </html> |