From 1c087fae322a1b07bb7bd554ee10ff473c47c727 Mon Sep 17 00:00:00 2001
From: Fin Reinhard <fin.reinhard@icloud.com>
Date: Tue, 22 Jan 2019 20:51:03 +0000
Subject: [PATCH] Merge branch 'master' into feature/15-archive-view-url
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/I18nRest.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/I18nRest.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/I18nRest.java
index 7e060d6..b17c855 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/I18nRest.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/I18nRest.java
@@ -20,9 +20,6 @@
public class I18nRest {
private Logger log = LoggerFactory.getLogger(I18nRest.class);
- @GET
- @Path("list")
- @Produces(MediaType.APPLICATION_JSON)
/**
*
* @param requestContext For detecting the user's client locale.
@@ -31,6 +28,9 @@
* @param prettyPrinter If true then the json output will be in pretty format.
* @see JsonUtils#toJson(Object, boolean)
*/
+ @GET
+ @Path("list")
+ @Produces(MediaType.APPLICATION_JSON)
public String getList(@Context HttpServletRequest requestContext, @QueryParam("prettyPrinter") boolean prettyPrinter,
@QueryParam("keysOnly") boolean keysOnly, @QueryParam("locale") String locale) {
Locale localeObject;
--
Gitblit v1.10.0