Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dev #161

Merged
merged 27 commits into from
Sep 8, 2017
Merged

Dev #161

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
4ddcb59
final commit before rebase 2
ORESoftware Aug 1, 2017
3b41096
reset:sft
ORESoftware Aug 1, 2017
d8600f5
Rebase branch (#139)
ORESoftware Aug 1, 2017
3568539
temp
ORESoftware Aug 1, 2017
1316bb0
merge with origin dev
ORESoftware Aug 1, 2017
3d87bbc
removed unnecessary files
ORESoftware Aug 1, 2017
553429d
master
ORESoftware Aug 1, 2017
e0a35a4
Merge branch 'master' into dev
ORESoftware Aug 1, 2017
2b52ad7
copy branch
ORESoftware Aug 1, 2017
b2efd78
remove files
ORESoftware Aug 1, 2017
74f6aa3
Feature alexamil (#144)
ORESoftware Aug 9, 2017
714a9ea
hotfix
ORESoftware Aug 11, 2017
c610f4e
merged hotfix
ORESoftware Aug 11, 2017
fc33a3f
pdev:set
ORESoftware Aug 11, 2017
73283d2
hotfix
ORESoftware Aug 11, 2017
89176e6
integrate:set
ORESoftware Aug 12, 2017
4d55e01
Feature alexamil 1502315157801 (#152)
ORESoftware Aug 30, 2017
9bee33b
Feature alexamil 1504130287958 (#153)
ORESoftware Aug 31, 2017
c8de686
Merge branch 'master' into dev
ORESoftware Aug 31, 2017
23f8731
Feature alexamil 1504208519267 (#155)
ORESoftware Sep 6, 2017
dbd9a87
Merge remote-tracking branch 'origin/dev' into dev
ORESoftware Sep 6, 2017
58678d6
Merge remote-tracking branch 'origin/master' into dev
ORESoftware Sep 6, 2017
11d33f6
Feature alexamil 1504657399214 (#157)
ORESoftware Sep 7, 2017
c7b8df5
Merge branch 'master' into dev
ORESoftware Sep 7, 2017
60190f0
Merge remote-tracking branch 'origin/dev' into dev
ORESoftware Sep 7, 2017
6fbb740
Merge branch 'master' into dev
ORESoftware Sep 7, 2017
3fff852
Feature alexamil 1504747816731 (#160)
ORESoftware Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/master' into dev
  • Loading branch information
@ORESoftware
ORESoftware committed Sep 6, 2017
commit 58678d60f8a4e72acac3ccda9f68acc71e0833ee

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.