IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://git.bukova.info/repos/git/isspst

Browse Source 
Conflicts:
	src/main/java/info/bukova/isspst/services/requirement/RequirementService.java
	src/main/java/info/bukova/isspst/services/requirement/RequirementServiceImpl.java
This commit is contained in:
Josef Rokos
2014-09-17 15:03:21 +02:00
parent 750ef2b153 7748dacd2a
commit f05318b9ba
13 changed files with 206 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/locales/zk-label.properties
+1
View File
@@ -287,6 +287,7 @@ LoginViaGoogle=Přihlásit účtem Google
DateFormat=dd. MM. yyyy
AddItem=Přidat položku
SelectGroup=Vybrat skupinu...
RemoveItem=Smazat
Amount=Částka