Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
server/res/core/en
History
Enno Rehling bbd4e31cf9 Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot 
Conflicts:
	res/core/de/strings.xml
 		2014-11-02 10:02:30 +01:00
..
strings.xml Merge branch 'loot' of github.com:CTD1/eressea-server-bugfixing into CTD1-loot 2014-11-02 10:02:30 +01:00