Mercurial > hg > nodescore
comparison www/m/css/jquery-ui-1.8.17.custom.css @ 35:5775286673c1
Merge branch 'master' of gitorious.org:nodescore/nodescore
Conflicts:
www/m/thumbs/1.png
www/m/thumbs/2.png
www/m/thumbs/3.png
www/m/thumbs/4.png
www/m/thumbs/5.png
www/m/thumbs/6.png
| author | tzara <rc-web@kiben.net> |
|---|---|
| date | Sun, 19 Aug 2012 22:23:11 +0000 |
| parents | 9070b2a7ca65 |
| children |
comparison
equal
deleted
inserted
replaced
| 32:c4719d1b7633 | 35:5775286673c1 |
|---|