Roy Marmelstein ca26cfc5c1 Merge branch 'master' of https://github.com/mihailsalari/FileBrowser into mihailsalari-master ...

# Conflicts:
#	FileBrowser.xcodeproj/project.pbxproj
#	FileBrowser/PreviewManager.swift
#	examples/Sample/Podfile
#	examples/Sample/Sample.xcodeproj/project.pbxproj
#	examples/Sample/Sample/AppDelegate.swift

2016-09-19 14:14:17 +02:00

..

project.xcworkspace

Re-organising folder and adding sample

2016-02-07 14:44:20 +01:00

project.pbxproj

Updated to Swift 3

2016-09-16 19:50:46 +03:00