Merge branch 'internetbird-master' into publish

forCrowd · Jul 9, 2016 · 6d68e16 · 6d68e16
2 parents c24b5bd + b7af64b
commit 6d68e16
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ### Changelog
 
+**0.61.4**
+
+* New contributor: Shai Aharoni
+
 **0.61.3**
 
 * New contributor: mrjsykes

diff --git a/SolutionItems/Properties/AssemblyInfo.cs b/SolutionItems/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //
 // AssemblyFileVersion is not in use for the moment
 //
-[assembly: AssemblyVersion("0.61.3")]
+[assembly: AssemblyVersion("0.61.4")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ngClient/_system/views/content/contributors.html b/ngClient/_system/views/content/contributors.html
@@ -70,6 +70,7 @@ <h2>
                             </tr>
                         </thead>
                         <tbody>
+
                             <tr>
                                 <td>
                                     <span>Serkan Holat</span>
@@ -98,6 +99,7 @@ <h2>
                                     <span am-time-ago="{{ vm.getDate(16, 6, 2016) }}"></span>
                                 </td>
                             </tr>
+
                             <tr>
                                 <td>
                                     <span>Azize Leylek</span>
@@ -117,6 +119,7 @@ <h2>
                                     <span am-time-ago="{{ vm.getDate(19, 6, 2016) }}"></span>
                                 </td>
                             </tr>
+
                             <tr>
                                 <td>
                                     <span>Özgür Sengelli</span>
@@ -136,6 +139,7 @@ <h2>
                                     <span am-time-ago="{{ vm.getDate(24, 6, 2016) }}"></span>
                                 </td>
                             </tr>
+
                             <tr>
                                 <td>
                                     <span>Johnathon Sykes</span>
@@ -158,6 +162,7 @@ <h2>
                                     <span am-time-ago="{{ vm.getDate(28, 6, 2016) }}"></span>
                                 </td>
                             </tr>
+
                             <tr>
                                 <td>
                                     <span>Sean Nam</span>
@@ -186,6 +191,30 @@ <h2>
                                     <span am-time-ago="{{ vm.getDate(29, 6, 2016) }}"></span>
                                 </td>
                             </tr>
+
+                            <tr>
+                                <td>
+                                    <span>Shai Aharoni</span>
+                                    <span class="nickname">InternetBird</span>
+                                </td>
+                                <td>Software Developer</td>
+                                <td>.NET, Javascript</td>
+                                <td>5+</td>
+                                <td>
+                                    <ul class="list-inline">
+                                        <li>
+                                            <a href="https://twitter.com/internetbird" target="_blank"><span class="fa fa-twitter fa-lg" aria-hidden="true"></span></a>
+                                        </li>
+                                        <li>
+                                            <a href="mailto:[email protected]" target="_blank"><span class="fa fa-envelope fa-lg" aria-hidden="true"></span></a>
+                                        </li>
+                                    </ul>
+                                </td>
+                                <td>
+                                    <span am-time-ago="{{ vm.getDate(9, 7, 2016) }}"></span>
+                                </td>
+                            </tr>
+
                         </tbody>
                     </table>
                 </div>