Merge branch 'dev'

apilayer · Aug 22, 2015 · 80a55cd · 80a55cd
2 parents 86ab906 + 9edf087
commit 80a55cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>vaeke</groupId>
     <artifactId>restcountries</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>war</packaging>
     <name>restcountries</name>
     <description>REST interface to get data about countries</description>

diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html
@@ -28,7 +28,7 @@
           		<div class="col-lg-12">
            			<div style="font-size: 67.5px;">REST Countries</div>
             		<p class="lead">Get information about countries via a RESTful API</p>
-            		<div>v1.1.1 <a href="https://github.com/fayder/restcountries/wiki/API-1.x.x">Wiki</a></div>
+            		<div>v1.1.2 <a href="https://github.com/fayder/restcountries/wiki/API-1.x.x">Wiki</a></div>
             		<br />
             		<a href="https://github.com/fayder/restcountries">
             			<img alt="github-octocat" src="img/octocat60px.png">