chore(merge): Merge remote-tracking branch 'origin/master'

Following Conflicts have been resolved:
        README.md
        src/_locales/bs/messages.json
        src/_locales/de/messages.json
        src/_locales/en/messages.json
        src/_locales/fr/messages.json
        src/_locales/ko/messages.json
        src/_locales/nb_NO/messages.json
        src/_locales/pt/messages.json
        src/_locales/pt_BR/messages.json
        src/_locales/sr/messages.json
        src/_locales/vi/messages.json
        src/assets/images/libredirect.svg
        src/assets/javascripts/services.js
        src/config.json
        src/manifest.json
        src/updates/updates.xml

1 files changed, 0 insertions, 112 deletions

diff --git a/src/_locales/sr/messages.json b/src/_locales/sr/messages.json
deleted file mode 100644
index d9ec4a74..00000000
--- a/src/_locales/sr/messages.json
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "extensionName": {
-        "message": "vhack-LibRedirect",
-        "description": "name of the extension"
-    },
-    "extensionDescription": {
-        "message": "A soft fork of the LibRedirect extension, preconfigured with the vhack.eu services",
-        "description": "description of the extension"
-    },
-    "switchInstance": {
-        "message": "Пребаци инстанцу",
-        "description": "used in manifest.json as shortcut description"
-    },
-    "settings": {
-        "message": "Подешавања",
-        "description": "used in the popup"
-    },
-    "general": {
-        "message": "Општенито",
-        "description": "used in the settings page"
-    },
-    "theme": {
-        "message": "Тема",
-        "description": "used in the settings page"
-    },
-    "light": {
-        "message": "Светла",
-        "description": "used in the settings page"
-    },
-    "dark": {
-        "message": "Мрачна",
-        "description": "used in the settings page"
-    },
-    "auto": {
-        "message": "Auto",
-        "description": "used in the settings page"
-    },
-    "excludeFromRedirecting": {
-        "message": "Искључено из преусмеравања",
-        "description": "used in the settings page"
-    },
-    "importSettings": {
-        "message": "Увозна Подешавања",
-        "description": "used in the settings page"
-    },
-    "exportSettings": {
-        "message": "Извозна Подешавања",
-        "description": "used in the settings page"
-    },
-    "resetSettings": {
-        "message": "Обновите Подешавања",
-        "description": "used in the settings page"
-    },
-    "enable": {
-        "message": "Омогући",
-        "description": "used in the settings page"
-    },
-    "showInPopup": {
-        "message": "Прикажи у искачућем прозору",
-        "description": "used in the settings page"
-    },
-    "frontend": {
-        "message": "Сучеље",
-        "description": "used in the settings page"
-    },
-    "redirectType": {
-        "message": "Тип Преусмеравања",
-        "description": "used in the settings page"
-    },
-    "both": {
-        "message": "оба",
-        "description": "used in the settings page"
-    },
-    "onlyEmbedded": {
-        "message": "само уграђено",
-        "description": "used in the settings page"
-    },
-    "onlyNotEmbedded": {
-        "message": "само неуграђено",
-        "description": "used in the settings page"
-    },
-    "addYourFavoriteInstances": {
-        "message": "Додајте своје омиљене инстанце",
-        "description": "used in the settings page"
-    },
-    "copyRaw": {
-        "message": "Копирајте необрађену коду"
-    },
-    "copied": {
-        "message": "Копирано"
-    },
-    "redirectToOriginal": {
-        "message": "Преусмерите према оригиналној",
-        "description": "Used in context menus when right clicking on a page/tab"
-    },
-    "redirectLink": {
-        "message": "Покушајте да преусмерите",
-        "description": "Used in context menus when right clicking on a hyperlink"
-    },
-    "about": {
-        "message": "О"
-    },
-    "unsupportedIframesHandling": {
-        "message": "Unsupported iframes handling"
-    },
-    "fetchPublicInstances": {
-        "message": "Fetch public instances"
-    },
-    "disable": {
-        "message": "Disable"
-    }
-}
\ No newline at end of file