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

Commit 1a469ca1 authored by Jason Chen's avatar Jason Chen
Browse files

Resolved conflicts for merge of 2bd6afed to master 

Change-Id: Ic9e854838004e9c5505cc1df8399cee3caa5e4e9
parents fe0ed457 2bd6afed

docs/html/guide/guide_toc.cs

+4 −0
Original line number Diff line number Diff line
@@ -278,6 +278,10 @@ 
              </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>

    </ul>

  </li>

docs/html/guide/topics/admin/device-admin.jd

0 → 100644
+494 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html/images/admin/device-admin-activate-prompt.png

0 → 100755
+37.7 KiB
Loading image diff...

docs/html/images/admin/device-admin-app.png

0 → 100755
+30.6 KiB
Loading image diff...