Changeset 5b3412 in indico
- Timestamp:
- 10/04/10 17:17:51 (3 years ago)
- Branches:
- master, burotel, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 4c7d4152dff271ba5df5a8606605969cab454080
- Children:
- a4c859
- Parents:
- c818e6
- git-author:
- csvetelina.angelova@…> (01/12/10 11:54:43)
- git-committer:
- Jose Benito <jose.benito.gonzalez@…> (10/04/10 17:17:51)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl
rc818e6 r5b3412 10 10 <tr> 11 11 <<<<<<< HEAD:indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl 12 <<<<<<< HEAD:indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl 12 13 <td colspan="3" class="groupTitle" style="width: 60%;padding-top:20px; border-bottom: none"> 14 ======= 15 <td colspan="3" class="groupTitle" style="padding-top:20px; border-bottom: none; font-size: 20px;"> 16 >>>>>>> 4608831... [FIXES] - task #108 + small layout fixes:indico/MaKaC/webinterface/tpls/ContributionReviewingHistory.tpl 13 17 ======= 14 18 <td colspan="3" class="groupTitle" style="padding-top:20px; border-bottom: none; font-size: 20px;">
Note: See TracChangeset
for help on using the changeset viewer.
