volse-hubzilla.git - Volse Hubzilla -- soft fork of main Hubzilla core for Volse

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of https://github.com/redmatrix/redmatrix	redmatrix	2015-06-21	1	-0/+146
\|\
\| *	some diaspora import issues uncovered during dry-run tests	redmatrix	2015-06-21	1	-6/+4
\| *	ensure the photo driver is included	redmatrix	2015-06-20	1	-0/+1
\| *	import_diaspora - incorrect method for importing channel photo, and add dupli...	redmatrix	2015-06-20	1	-20/+42
\| *	wrong logic	redmatrix	2015-06-19	1	-1/+1
\| *	import_diaspora - a few more atypical settings	redmatrix	2015-06-19	1	-3/+19
\| *	import_diaspora: add all the friends	redmatrix	2015-06-19	1	-4/+13
\| *	very early attempt diaspora import from diaspora export file. Currently the j...	redmatrix	2015-06-19	1	-0/+100
* \|	Merge branch 'master' into tres	redmatrix	2015-05-14	2	-3/+8
\|\ \
\| * \|	convert ITEM_WALL from bitfield to standalone	redmatrix	2015-05-06	1	-2/+4
\| * \|	first pass name change	redmatrix	2015-05-05	2	-3/+3
\| \|/
* \|	Merge branch 'master' into tres	friendica	2015-04-23	1	-1/+1
\|\\|
\| *	Change logic of "don't create a status post for this photo upload" and turn i...	friendica	2015-03-10	1	-1/+1
* \|	slow progress removing bitfields on item table	friendica	2015-01-21	1	-2/+6
\|/
*	Some Doxygen comments and small cleanups.	Klaus Weidenbach	2014-12-07	2	-27/+13
*	provide example import script	friendica	2014-11-03	2	-0/+376