| 
							
						 | 
						
							
							
								
							
							
	68ce62d503
						 | 
						
							
							
								
								
								migrations: merge brings the same migration.
							
							
							
							
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 | 
						
							2015-05-30 15:31:07 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5829c9fa4a
						 | 
						
							
							
								
								
								Merge branch 'railshosting' of git.ungleich.ch:dynamicweb into feature/integrate-railshosting
							
							
							
							
							
							
							
							
							Conflicts:
dynamicweb/settings.py
    Added railshosting app and deleted .settings_local import.
dynamicweb/urls.py
   Added railshosting url.
Signed-off-by: rscnt <rascnt@gmail.com>
							
						 | 
						
							2015-05-30 15:29:33 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	b155fb2c81
						 | 
						
							
							
								
								
								+migration
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@wurzel.schottelius.org> 
							
						 | 
						
							2015-05-27 21:31:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	75acdaf3a5
						 | 
						
							
							
								
								
								migration: added digital_glarus migration.
							
							
							
							
							
							
							
							
							Signed-off-by: rscnt <rascnt@gmail.com> 
							
						 | 
						
							2015-05-21 22:52:56 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	5d1b26d4f7
						 | 
						
							
							
								
								
								add first view to digital.glarus
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org> 
							
						 | 
						
							2015-05-02 17:15:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Nico Schottelius
								
							 
						 | 
						
							
							
								
							
							
	1dff90c99b
						 | 
						
							
							
								
								
								start digital glarus
							
							
							
							
							
							
							
							
							Signed-off-by: Nico Schottelius <nico@freiheit.schottelius.org> 
							
						 | 
						
							2015-05-02 17:00:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |