akonadi

Author	SHA1	Message	Date
Rex Dieter	946dc68fe0	Merge branch 'master' into f20	2015-04-11 18:38:17 -05:00
Rex Dieter	e0ada37c38	Merge commit '`adf30afcb0`' into f20	2015-02-06 10:06:27 -06:00
Rex Dieter	8c751f18f1	Merge branch 'f21' into f20	2014-10-03 14:17:56 -05:00
Rex Dieter	f2649a3bbc	Merge commit '`338a460da5`' into f20	2014-09-16 13:19:29 -05:00
Rex Dieter	a455be496d	Merge branch 'master' into f20	2014-05-01 13:12:04 -05:00
Rex Dieter	412777560a	Revert "Backport 1.12 commit to fix upgrade from Akonadi<1.12 for users with invalid DB entries" This reverts commit `47a2edf9c2`.	2014-05-01 13:11:59 -05:00
Dan Vrátil	47a2edf9c2	Backport 1.12 commit to fix upgrade from Akonadi<1.12 for users with invalid DB entries	2014-04-22 11:53:53 +02:00

Compare commits