| commit | 73974b9504e2d3a4a4221d5c7bb3cd4b361c22c3 | |
| author | Jose Benito <jose.benito.gonzalez@cern.ch> | |
| Thu, 25 Oct 2012 14:12:28 +0000 (25 16:12 +0200) | ||
| committer | Jose Benito <jose.benito.gonzalez@cern.ch> | |
| Thu, 25 Oct 2012 14:12:28 +0000 (25 16:12 +0200) | ||
| tree | 728dfad6d58a633b75948d4b59bb52d78886ba38 | treesnapshot (tar.gz zip) |
| parent | d6b5452cd22e2e0f865cedeebba72161d3281ba0 | commitdiff |
| parent | 48e62f7e63e450b69c7025aacc6e740df3818595 | commitdiff |
Merge branch 'v0.98.3'
Conflicts:
indico/MaKaC/contributionReviewing.py
Conflicts:
indico/MaKaC/contributionReviewing.py
| indico/MaKaC/contributionReviewing.py | diff1 | diff2 | blobhistory |
| indico/htdocs/css/events/common.css | diff1 | diff2 | blobhistory |