Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 068e6956 authored by Dirk Dougherty's avatar Dirk Dougherty
Browse files

Doc change: Merge commit 'd555e264' into manualmerge 

Conflicts:
	docs/html/guide/guide_toc.cs

Change-Id: I473bc026fe24caf6a851e8f282b1874c75ef5a30
parents b5783214 d555e264

docs/html/guide/guide_toc.cs

+2 −6
Original line number Diff line number Diff line
@@ -278,13 +278,9 @@ 
              </li>

           </ul>

      </li>

     <li><a href="<?cs var:toroot?>guide/topics/admin/device-admin.html">

            <span class="en">Device Administration</span></a>

            <span class="new">new!</span>

    </li>

     <li><a href="<?cs var:toroot?>guide/topics/admin/device-admin.html">

            <span class="en">Device Administration</span>

        </a> <span class="new">new!</span><!-- 10/8/10 -->

         </a> <span class="new">new!</span>

    </li>

    </ul>

  </li>