Raphael 9d71ed1120 Merge remote branch 'robustdj/453-aspect-labels' ... Conflicts: app/models/user.rb pkg/ubuntu/dist		2010-11-02 11:31:51 -07:00
..
controllers	robustdj's specs now green	2010-11-02 11:27:51 -07:00
helpers	Merge branch 'translation-refactor' of http://github.com/Hexagon/diaspora into Hexagon-translation-refactor	2010-11-02 16:34:47 +01:00
mailers	stubbing out the hub publish method	2010-10-29 12:09:10 -07:00
models	Merge remote branch 'robustdj/453-aspect-labels'	2010-11-02 11:31:51 -07:00
uploaders	Add or later to license notice	2010-10-07 16:25:34 -07:00
views	REMOVED IMPORTER	2010-11-02 11:17:47 -07:00