| 
							
							
								 redmatrix | bc1b7afc85 | start to partition the dav | 2015-06-10 18:11:15 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 76558df966 | Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po | 2015-05-17 19:48:57 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 91d7b0f7eb | more work isolating the projectname from core. | 2015-05-17 16:28:16 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | 5b5f0666f9 | second pass name change | 2015-05-05 03:59:51 -07:00 |  | 
			
				
					| 
							
							
								 redmatrix | a3c37f1458 | first pass name change | 2015-05-05 03:56:10 -07:00 |  | 
			
				
					| 
							
							
								 friendica | a496036066 | local_user => local_channel | 2015-01-28 20:56:04 -08:00 |  | 
			
				
					| 
							
							
								 friendica | 1b3e52af2d | theme toggle issue when viewing mod/cloud of another channel | 2015-01-12 18:33:39 -08:00 |  | 
			
				
					| 
							
							
								 friendica | c05586fbe7 | begin the grand unification for 3.0. Start by splitting DAV into a web accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources. | 2015-01-06 11:55:42 -08:00 |  |