Merge remote-tracking branch 'refs/remotes/upstream/master'

Conflicts:
	app/Locale/de_DE/translations.php

1 files changed, 0 insertions, 25 deletions

diff --git a/assets/js/src/Sidebar.js b/assets/js/src/Sidebar.js
deleted file mode 100644
index 0794d6b3..00000000
--- a/assets/js/src/Sidebar.js
+++ /dev/null
@@ -1,25 +0,0 @@
-function Sidebar() {
-}
-
-Sidebar.prototype.expand = function(e) {
-    e.preventDefault();
-    $(".sidebar-container").removeClass("sidebar-collapsed");
-    $(".sidebar-collapse").show();
-    $(".sidebar h2").show();
-    $(".sidebar ul").show();
-    $(".sidebar-expand").hide();
-};
-
-Sidebar.prototype.collapse = function(e) {
-    e.preventDefault();
-    $(".sidebar-container").addClass("sidebar-collapsed");
-    $(".sidebar-expand").show();
-    $(".sidebar h2").hide();
-    $(".sidebar ul").hide();
-    $(".sidebar-collapse").hide();
-};
-
-Sidebar.prototype.listen = function() {
-    $(document).on("click", ".sidebar-collapse", this.collapse);
-    $(document).on("click", ".sidebar-expand", this.expand);
-};