From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Thu, 17 Sep 2015 09:14:52 +0000 (+0200)
Subject: Merge branch 'pro' of git.parisson.com:git/teleforma into pro
X-Git-Tag: 2.8.1-pro~282
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=608efa63fe1c29af8bceb382bce61e046ec068d1;p=teleforma.git

Merge branch 'pro' of git.parisson.com:git/teleforma into pro

Conflicts:
	teleforma/admin.py
---

608efa63fe1c29af8bceb382bce61e046ec068d1
diff --cc teleforma/admin.py
index 18a522d8,c844f32f..fdd07bbd
--- a/teleforma/admin.py
+++ b/teleforma/admin.py
@@@ -94,8 -94,9 +94,14 @@@ class TestimonialAdmin(admin.ModelAdmin
      search_fields = ['seminar__course__title', 'seminar__sub_title',
                      'user__username', 'user__last_name']
  
++<<<<<<< HEAD
 +class AnswerAdmin(admin.ModelAdmin):
 +    search_fields = ['user__username', 'user__last_name']
++=======
+ class SeminarRevisionAdmin(admin.ModelAdmin):
+     search_fields = ['user__username', 'seminar__title']
+ 
++>>>>>>> ab123a8a998ce88c547a184b409bb3201de46671
  
  admin.site.unregister(User)
  admin.site.register(User, UserProfileAdmin)