Merge branch 'feature/version-1-2'

tomkowz · Aug 2, 2015 · 06c9f69 · 06c9f69
2 parents 103dd24 + 99b6106
commit 06c9f69
Show file tree

Hide file tree

Showing 152 changed files with 10,864 additions and 8,062 deletions.
diff --git a/DemoOrdering/AppDelegate.swift b/DemoOrdering/AppDelegate.swift
diff --git a/DemoOrdering/Base.lproj/Expressions.strings b/DemoOrdering/Base.lproj/Expressions.strings
diff --git a/DemoOrdering/Base.lproj/Localizable.strings b/DemoOrdering/Base.lproj/Localizable.strings
diff --git a/DemoOrdering/Images.xcassets/AppIcon.appiconset/Contents.json b/DemoOrdering/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/DemoOrdering/Info.plist b/DemoOrdering/Info.plist
diff --git a/DemoOrdering/LaunchScreen.xib b/DemoOrdering/LaunchScreen.xib
diff --git a/DemoOrdering/Main.storyboard b/DemoOrdering/Main.storyboard
diff --git a/DemoOrdering/ViewController.swift b/DemoOrdering/ViewController.swift
diff --git a/DemoOrdering/pl.lproj/Expressions.strings b/DemoOrdering/pl.lproj/Expressions.strings
diff --git a/DemoOrdering/pl.lproj/Localizable.strings b/DemoOrdering/pl.lproj/Localizable.strings