Jamal Kaabi-Mofrad 7d7f7edae9 Missed changes during resolving conflicts. ...

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

2016-06-02 22:58:00 +00:00

..

activities

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

node/ratings

Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

2016-05-10 11:52:16 +00:00

ActivitiesImpl.java

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-03-14 15:45:02 +00:00

AuthenticationsImpl.java

Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)

2016-06-02 21:38:17 +00:00

CommentsImpl.java

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

2014-04-02 21:46:59 +00:00

CustomModelsImpl.java

Merged CMM to HEAD

2015-08-11 21:53:28 +00:00

DefaultExceptionHandler.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

DeletedNodesImpl.java

Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

2016-05-10 11:48:35 +00:00

ExceptionHandler.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

ExceptionInterceptor.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

ExcludedTypes.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

FavouritesImpl.java

Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)

2016-06-02 21:17:46 +00:00

LegacyExceptionHandler.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

NetworksImpl.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

NodeRatingsImpl.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

NodesImpl.java

Missed changes during resolving conflicts.

2016-06-02 22:58:00 +00:00

PeopleImpl.java

Merged 5.1-MC1 (5.1.0) to HEAD (5.1)

2015-12-10 10:35:05 +00:00

PreferencesImpl.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

QueriesImpl.java

Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

2016-05-10 11:49:46 +00:00

QuickShareLinksImpl.java

Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)

2016-06-02 22:25:13 +00:00

RenditionsImpl.java

Missed changes during resolving conflicts.

2016-06-02 22:58:00 +00:00

SiteImportPackageHandler.java

Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)

2016-06-02 21:18:03 +00:00

SiteMembershipRequestsExceptionHandler.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

SiteMembershipRequestsImpl.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

SitesImpl.java

Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)

2016-06-02 22:24:27 +00:00

SiteSurfConfig.java

Merged API-STRIKES-BACK (5.2.0) to HEAD (5.2)

2016-06-02 21:18:03 +00:00

TagsImpl.java

Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

2013-08-20 17:17:31 +00:00

Util.java

Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)

2016-05-10 11:04:40 +00:00