| .. |
|
admin
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
bestpractices/BestPractice
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
emailer
|
emailer changes for both website and emailer
|
2011-12-08 12:05:33 -05:00 |
|
erang
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
erang_organised/Issue
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
festival/Project
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
modules
|
changes to modules
|
2011-12-09 06:59:34 -05:00 |
|
noel
|
temporary download button for best practices - had to change title font to 22px to accomodate extra button
|
2011-11-08 09:49:23 +05:30 |
|
registration
|
emailer changes
|
2011-12-08 09:49:39 -05:00 |
|
search
|
emailer changes
|
2011-12-08 09:49:39 -05:00 |
|
404.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
500.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
base.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
bestpractices.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
bpdownload.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
bpfaq.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
bpglossary.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
bpguideline.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
bpguidelines.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
bpstories.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
bpstory.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
erang.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
festival_base.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
festival_index.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
festival_wireframe.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
home.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
index.html
|
boxes successfully render on page
|
2011-04-10 07:30:43 +05:30 |
|
meeting_details.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
meeting.html
|
typo
|
2011-11-07 16:16:18 +05:30 |
|
meetings.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
mockup.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
people.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
project.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
projects.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
publications.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
resources.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
robots.txt
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
surveys.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
video.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
x0disc.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
x0erang.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
x0multi.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
x0news.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
x0profile.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
|
x0resources.html
|
resolved conflicts
|
2011-10-08 03:03:05 -04:00 |
