Merge remote-tracking branch 'origin/master'

Conflicts: src/main/resources/static/js/controllers.js src/main/resources/static/partials/transaction-list.html
2016-07-09 12:03:51 +02:00
parent 89ea392bd7 30f82644ad
commit 2938d08d5c
2 changed files with 1 additions and 2 deletions
@@ -181,4 +181,4 @@
 			</div>
 		</div>			
 	</div>
-</div>
+</div>