From: Ivan Kohler <ivan@freeside.biz>
Date: Wed, 8 May 2019 19:58:23 +0000 (-0700)
Subject: Merge branch 'master' of git.freeside.biz:/home/git/www
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=c12c896bb36b6345fbc7de37beaddfb53f5882ff;hp=cf9380be0c764c8299f2d8496370d45af2354f41;p=www.git

Merge branch 'master' of git.freeside.biz:/home/git/www
---

diff --git a/developers.html b/developers.html
index 07b461d..b922218 100644
--- a/developers.html
+++ b/developers.html
@@ -51,7 +51,7 @@
                 <ul class="indented">
                   <li>Browse the source tree: <A HREF="http://git.freeside.biz/cgit/freeside.git">cgit</A> or <A HREF="http://git.freeside.biz/gitweb/?p=freeside.git">gitweb</A>
                   <li><A HREF="git.html">Instructions on accessing the development tree with git</A>
-<!--                  <li><A HREF="/gitstats/">Useless git statistics</A> -->
+                  <li><A HREF="http://git.freeside.big//gitstats/">Useless git statistics</A>
                 </ul>
               Developer mailing list
                 <ul class="indented"> 
diff --git a/index.html b/index.html
index 0134135..f02980e 100644
--- a/index.html
+++ b/index.html
@@ -11,6 +11,7 @@
     <td width="450" align="center" valign="top" bgcolor="#BEBDBD" STYLE="padding:4px">
 
 
+<!--
 
       <table> 	
 
@@ -27,7 +28,7 @@
 
         <tr>
           <td align="center">
-            <a href="http://www.wispa.org/Events/WISPAmerica" target="_blank"><img src="wispamerica2018.png" width=180 border=0 align="center" alt="WISPAmerica"></a>
+            <a href="" target="_blank"><img src="wispamerica2018.png" width=180 border=0 align="center" alt="WISPAmerica"></a>
           </td>
 
           <td align=top>
@@ -40,6 +41,8 @@
 
       </table>
 
+-->
+
       <table width="420" height="*" border="0" cellpadding="0" cellspacing="0">
 
         <tr>
@@ -60,10 +63,16 @@
 
 <!--
 	      <tr align="left" valign="top">
-                <td width="115" align="right" valign="top"><b>Aug&nbsp;XX&nbsp;2017:</b></td>
-                <td width="*"><a href="/blog/2017/08/freeside-4-3-released/">4.3 released</a></td>
+                <td width="115" align="right" valign="top"><b>Apr&nbsp;XX&nbsp;2018:</b></td>
+                <td width="*"><a href="/blog/2018/04/freeside-4-3-released/">4.3 released</a></td>
               </tr>
 -->
+
+	      <tr align="left" valign="top">
+                <td width="115" align="right" valign="top"><b>Mar&nbsp;6-8&nbsp;2018:</b></td>
+                <td width="*">Exhibited at <a href="http://www.wispa.org/Events/WISPAmerica">WISPAmerica</a></td>
+              </tr>
+
 	      <tr align="left" valign="top">
                 <td width="115" align="right" valign="top"><b>Feb&nbsp;14&#8209;16&nbsp;2018:</b></td>
                 <td width="*">Exhibited at IT Expo / Asterisk World</td>
@@ -104,11 +113,6 @@
                 <td width="*"><a href="/blog/2017/03/freeside-4-2-released/">4.2 released</a></td>
               </tr>
 
-	      <tr align="left" valign="top">
-                <td width="115" align="right" valign="top"><b>Mar&nbsp;14&#8209;16&nbsp;2017:</b></td>
-                <td width="*">Exhibited at <a href="http://www.wispa.org/Events/WISPAmerica">WISPAmerica</a></td>
-              </tr>
-
             </table></td>
           <td width="9" height="*" bgcolor="#A5A3A3">&nbsp;</td>
         </tr>