Conflicts: k4ever/buyable/templates/buyables/showItems.html k4ever/media/css/style.css |
||
|---|---|---|
| client-barcode | ||
| devel | ||
| display-daemon | ||
| k4ever | ||
| .gitignore | ||
Conflicts: k4ever/buyable/templates/buyables/showItems.html k4ever/media/css/style.css |
||
|---|---|---|
| client-barcode | ||
| devel | ||
| display-daemon | ||
| k4ever | ||
| .gitignore | ||