Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

feeds
- Activity
- Members
- Labels
- Releases
- Model registry

Snippets Groups Projects

2d49bf7d

Commit 2d49bf7d authored 13 years ago by Dave Reid

Downloads
- Plain Diff

Merge branch '7.x-2.x' of git.drupal.org:project/feeds into 7.x-2.x

parents c1fb8e2e d350c451

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

feeds.info 0 additions, 14 deletions

feeds.info
feeds.module 11 additions, 0 deletions

feeds.module
feeds_import/feeds_import.test 2 additions, 3 deletions

feeds_import/feeds_import.test
includes/FeedsImporter.inc 9 additions, 3 deletions

includes/FeedsImporter.inc
libraries/simplepie.inc 15299 additions, 0 deletions

libraries/simplepie.inc
plugins/FeedsNodeProcessor.inc 50 additions, 18 deletions

plugins/FeedsNodeProcessor.inc
plugins/FeedsUserProcessor.inc 7 additions, 0 deletions

plugins/FeedsUserProcessor.inc
tests/feeds/assets/la fayette.jpeg 0 additions, 0 deletions

tests/feeds/assets/la fayette.jpeg
tests/feeds_mapper_file.test 6 additions, 0 deletions

tests/feeds_mapper_file.test
tests/feeds_processor_user.test 3 additions, 4 deletions

tests/feeds_processor_user.test

with 15387 additions and 42 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment