exane 961fe30da8 Merge remote-tracking branch 'origin/master'		2015-06-24 15:46:13 +02:00
assets	adapt faction value to match better keys	2015-06-24 15:08:29 +02:00
client	tidy up	2015-06-24 15:10:54 +02:00
public	add proper templates	2015-06-22 17:29:01 +02:00
server	tidy up	2015-06-24 15:10:54 +02:00
site	load cards	2015-06-24 15:21:17 +02:00
test	extend filter	2015-06-23 15:00:49 +02:00
.gitignore	remove composer lock	2015-06-23 13:26:05 +02:00
gulpfile.js	minor bugfixes	2015-06-22 17:42:48 +02:00
package.json	add card redraw at battle begin	2015-06-23 18:12:11 +02:00