]> mj.ucw.cz Git - pciids.git/commit
Merge branch 'master' of /home/vorner/pciids
authorThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 6 Oct 2008 16:29:14 +0000 (18:29 +0200)
committerThe PCI ID Mail Robot <pciids@ucw.cz>
Mon, 6 Oct 2008 16:29:14 +0000 (18:29 +0200)
commitb7fefe5ac58740241c7dc6bc56db210a187b3ece
tree8f50d5f76037c10b218657d4be58e5edaac815d7
parentaf241f0d2e8d7e977be16ccaf6d463e0b095a760
parentc071194e6e2e9422b7ad9567925b61dcd3e3c822
Merge branch 'master' of /home/vorner/pciids

Conflicts:

static/screen.css