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/VersionRest.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/VersionRest.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/VersionRest.java
index efd277f..82f033f 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/VersionRest.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/rest/VersionRest.java
@@ -22,15 +22,15 @@
public class VersionRest {
private Logger log = LoggerFactory.getLogger(VersionRest.class);
- @GET
- @Path("version")
- @Produces(MediaType.APPLICATION_JSON)
/**
*
* @param requestContext For detecting the user's client locale.
* @param prettyPrinter If true then the json output will be in pretty format.
* @see JsonUtils#toJson(Object, boolean)
*/
+ @GET
+ @Path("version")
+ @Produces(MediaType.APPLICATION_JSON)
public String getVersion(@Context HttpServletRequest requestContext, @QueryParam("prettyPrinter") boolean prettyPrinter) {
UserData user = RestUtils.getUser();
String language = Languages.asString(user.getLocale());
--
Gitblit v1.10.0