Skip to content
This repository was archived by the owner on Nov 26, 2020. It is now read-only.

Swift23#161

Merged
hebertialmeida merged 8 commits into
masterfrom
swift23
Oct 6, 2016
Merged

Swift23#161
hebertialmeida merged 8 commits into
masterfrom
swift23

Conversation

@hebertialmeida
Copy link
Copy Markdown
Member

Conflicts:

Example/Podfile.lock

# Conflicts:
#	Source/EPUBCore/FREpubParser.swift
#	Source/FolioReaderPage.swift
#	Source/FolioReaderPageIndicator.swift
# Conflicts:
#	Example/Podfile.lock
#	Source/FolioReaderPage.swift
# Conflicts:
#	Example/Podfile.lock
# Conflicts:
#	Example/Podfile.lock
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant