Merge branch 'develop'

PAN001 · Sep 12, 2016 · bd59f86 · bd59f86
2 parents 215b82d + 000ab83
commit bd59f86
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/public/.DS_Store b/public/.DS_Store
diff --git a/public/QNote.html b/public/QNote.html
@@ -540,7 +540,7 @@
                                     </li>
 
 
-                                    <li class="dropdown" id="attachDropdown">
+<!--                                     <li class="dropdown" id="attachDropdown">
                                         <a class="ios7-a dropdown-toggle" data-toggle="dropdown" id="showAttach" title="Attachments">
                                             <span class="fa fa-paperclip"></span>
                                             <span id="attachNum"></span>
@@ -565,7 +565,7 @@
                                                 </div>
                                             </form>
                                         </div>
-                                    </li>
+                                    </li> -->
 
 
 <!--

diff --git a/public/public/.DS_Store b/public/public/.DS_Store
diff --git a/public/qnote.html b/public/qnote.html
@@ -540,7 +540,7 @@
                                     </li>
 
 
-                                    <li class="dropdown" id="attachDropdown">
+<!--                                     <li class="dropdown" id="attachDropdown">
                                         <a class="ios7-a dropdown-toggle" data-toggle="dropdown" id="showAttach" title="Attachments">
                                             <span class="fa fa-paperclip"></span>
                                             <span id="attachNum"></span>
@@ -565,7 +565,7 @@
                                                 </div>
                                             </form>
                                         </div>
-                                    </li>
+                                    </li> -->
 
 
 <!--