Skip to content

Commit

Permalink
Merge branch '2.0.0'
Browse files Browse the repository at this point in the history 
# Conflicts:
#	README.md
#	changelog.json
#	feedme/FeedMePlugin.php
#	feedme/resources/js/FeedMeHelp.js
#	feedme/services/FeedMeService.php
#	feedme/services/FeedMe_EntryService.php
#	feedme/services/FeedMe_FeedJSONService.php
#	feedme/services/FeedMe_FeedService.php
#	feedme/services/FeedMe_FieldsService.php
#	feedme/tasks/FeedMeTask.php
#	feedme/templates/feeds/_edit.html
#	feedme/templates/feeds/_map.html
#	feedme/templates/feeds/index.html
  • Loading branch information
@engram-design
engram-design committed Feb 25, 2017
2 parents f676297 + 9bf6873 commit e50c31d
Show file tree
Hide file tree
Showing 145 changed files with 13,588 additions and 2,879 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea
128 changes: 0 additions & 128 deletions CHANGELOG.md
View file

This file was deleted.

Loading

0 comments on commit e50c31d

Please sign in to comment.