Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
		
				commit
				
					
						ec12689904
					
				
			
		
					 1 changed files with 2 additions and 1 deletions
				
			
		|  | @ -1,9 +1,10 @@ | ||||||
| from .base import * | from .base import * | ||||||
| 
 | 
 | ||||||
| DEBUG = False | DEBUG = True  | ||||||
| 
 | 
 | ||||||
| ADMINS = ( | ADMINS = ( | ||||||
|     ('Nico Schottelius', 'nico.schottelius@ungleich.ch'), |     ('Nico Schottelius', 'nico.schottelius@ungleich.ch'), | ||||||
|  |     ('Raul Ascencio', 'raul.ascencio@yandex.com'), | ||||||
| ) | ) | ||||||
| #    ('Sanghee Kim', 'sanghee.kim@ungleich.ch'), | #    ('Sanghee Kim', 'sanghee.kim@ungleich.ch'), | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue