Merge branch 'develop_dropdown_bookmark' of github.com:atm-john/dolibarr into develop_dropdown_bookmark

2019-09-29 20:25:50 +02:00 · 2019-09-29 20:25:50 +02:00 · e77e5ee2e3
commit e77e5ee2e3
parent 2684daabc7 c8ab03432b
2 changed files with 1 additions and 2 deletions
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@ -286,4 +286,4 @@ function printDropdownBookmarksList($aDb, $aLangs)
    }

    return $html;
-}
+}
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@ -1973,7 +1973,6 @@ function top_menu_bookmark(User $user, Translate $langs)
        });
        </script>
        ';
-
    }
    return $html;
 }