Commit graph

5 commits

Author SHA1 Message Date
Julio García 8e047aaa9c Merge remote-tracking branch 'upstream/master' into merge-upstream
Conflicts:
	SoObjects/SOGo/SOGoUserManager.m
	Tools/SOGoToolRestore.m
2015-06-26 09:41:58 +02:00
Javier Amor García 5e84f2817f sogo-tool: Added create-folder command 2015-06-02 13:17:35 +02:00
Wolfgang Sourdeau 8625d73754 Monotone-Parent: 6e63aa35b75cb2a5e245d67e76efebed7505a5e5
Monotone-Revision: 54c370d8695670130da586c6fb0f9e2d3da6057c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-15T21:15:10
Monotone-Branch: ca.inverse.sogo
2010-04-15 21:15:10 +00:00
Wolfgang Sourdeau 31a647b194 Monotone-Parent: 98e35c999db27e9159edf91d2c17f8b5bc742330
Monotone-Revision: 831abd52d51297f3a0de88978cf6abeda7fad46c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-08-14T14:57:05
Monotone-Branch: ca.inverse.sogo
2009-08-14 14:57:05 +00:00
Wolfgang Sourdeau 70898b25f1 Monotone-Parent: 9755daf6ba583e833c7bab387fc5e777c6272bd1
Monotone-Revision: 98e35c999db27e9159edf91d2c17f8b5bc742330

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-08-14T12:23:35
Monotone-Branch: ca.inverse.sogo
2009-08-14 12:23:35 +00:00