| 
								
								
									 Luke Hatcher | 74cacbdb5b | Merge branch 'fresh-start' into cms-features Conflicts:
	symposion_project/requirements/base.txt | 2012-02-05 20:43:09 -05:00 |  | 
				
					
						| 
								
								
									 Luke Hatcher | d0be075c89 | adding prototype cms app with pages and menu | 2012-02-05 20:34:49 -05:00 |  | 
				
					
						| 
								
								
									 James Tauber | 57e6ccf2ca | Merge branch 'initial-docs' into fresh-start | 2012-02-05 17:51:24 -05:00 |  | 
				
					
						| 
								
								
									 James Tauber | c4b03049ed | added some initial wording to the docs | 2012-02-05 17:51:04 -05:00 |  | 
				
					
						| 
								
								
									 James Tauber | df720729a0 | added gitignore with docs _build | 2012-02-05 17:45:46 -05:00 |  | 
				
					
						| 
								
								
									 James Tauber | a3cae9f764 | initial sphinx configuration | 2012-02-05 17:32:14 -05:00 |  | 
				
					
						| 
								
								
									 James Tauber | cfc5db0a08 | upgraded bootstrap theme | 2012-02-05 17:14:46 -05:00 |  | 
				
					
						| 
								
								
									 James Tauber | 0f6843b08d | pinax account project | 2012-02-05 13:53:49 -05:00 |  | 
				
					
						| 
								
								
									 James Tauber | 086d2d1cc0 | first commit | 2012-02-05 13:38:52 -05:00 |  |