Commit 90b5fc73 authored by Zach Knox's avatar Zach Knox

Merge branch 'master' into 'dev-1.2'

# Conflicts:
#   .gitignore
#   README.md
#   WhatsOpen/WhatsOpen - AppStore.entitlements
#   WhatsOpen/WhatsOpen.xcodeproj/project.pbxproj
#   WhatsOpen/WhatsOpen/Info.plist
#   WhatsOpen/WhatsOpenKit/Info.plist
#   WhatsOpen/WhatsOpenKit/WhatsOpenKit.h
parents 80bd3806 9ffdc2ea
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment