Commit graph

2 commits

Author SHA1 Message Date
Michael Gapczynski
11d1627513 Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts:
	lib/base.php
2011-07-30 19:40:19 -04:00
Michael Gapczynski
029b21bf54 First implementation of sharing user interface 2011-07-20 13:34:16 -04:00