 ynerant
		
	
	395c52220f
	
	
	Merge branch 'master' into 'tranfer_front'
			ynerant
		
	
	395c52220f
	
	
	Merge branch 'master' into 'tranfer_front'
		
			
			# Conflicts:
#   apps/activity/views.py
#   apps/permission/backends.py
#   locale/de/LC_MESSAGES/django.po
#   locale/fr/LC_MESSAGES/django.po
#   static/js/base.js
#   templates/base.html
#   templates/member/user_list.html
		
	
 
		2020-05-07 18:48:35 +02:00
	 
	
	
	
		 ..
	
	
	
		
			
			
			
			
			
			2020-04-10 02:56:56 +02:00
		 
	
		
			
			
			
			
			
			2020-03-27 14:07:22 +01:00
		 
	
		
			
			
			
			
			
			2019-08-11 14:47:44 +02:00
		 
	
		
			
			
			
			
			
			2020-05-07 18:48:35 +02:00
		 
	
		
			
			
			
			
			
			2020-03-27 13:50:02 +01:00
		 
	
		
			
			
			
			
			
			2019-08-11 14:47:44 +02:00
		 
	
		
			
			
			
			
			
			2020-02-18 21:30:26 +01:00
		 
	
		
			
			
			
			
			
			2020-04-05 09:09:21 +02:00
		 
	
		
			
			
			
			
			
			2020-02-18 21:30:26 +01:00
		 
	
		
			
			
			
			
			
			2020-04-27 03:21:13 +02:00
		 
	
		
			
			
			
			
			
			2020-04-22 03:26:45 +02:00
		 
	
		
			
			
			
			
			
			2020-04-27 03:56:22 +02:00
		 
	
		
			
			
			
			
			
			2020-03-27 18:02:22 +01:00
		 
	
		
			
			
			
			
			
			2020-05-07 18:48:35 +02:00