git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'gilbert' into gilbert-1.3
[philo.git]
/
contrib
/
julian
/
admin.py
diff --git
a/contrib/julian/admin.py
b/contrib/julian/admin.py
index
72bdef7
..
8f104e2
100644
(file)
--- a/
contrib/julian/admin.py
+++ b/
contrib/julian/admin.py
@@
-19,7
+19,7
@@
class EventAdmin(EntityAdmin):
'fields': (('start_date', 'start_time'), ('end_date', 'end_time'),),
}),
('Advanced', {
- 'fields': ('parent_event', '
uuid
',),
+ 'fields': ('parent_event', '
site
',),
'classes': COLLAPSE_CLASSES
})
)