Skip to content

Commit

Permalink
Merge branch '2.x' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
isuPatches authored Jul 23, 2017
2 parents ce50002 + 87b121f commit 075f505
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions changes/2.x.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## v2.0.0 - 07/22/2017
## v2.0.0 07/22/2017

#### Last part of 2.0.0 going up
commit 625ee1337c82ad4a6fbdde7e5c9bd375c1ae134d<br/>
Expand All @@ -13,8 +13,8 @@ Date: Sat Jul 22 22:37:31 2017 -0500
commit c41d1358feda96db6bb0a7979e61f476c9a63c1f<br/>
Author: Patches <[email protected]><br/>
Date: Fri Jul 21 19:46:32 2017 -0500

## v2.0.0-BETA1 - 7/20/2017
## v2.0.0-BETA1 07/20/2017

#### Merge branch '2.x' into develop
commit c756d917a72d5942960abc7709c4641cd9483ad3<br/>
Expand All @@ -32,7 +32,7 @@ commit 361907754313448d9f33363ef5fcd56f35b49cf5<br/>
Merge: 0a3cc80 063f988<br/>
Author: Patches <[email protected]><br/>
Date: Thu Jul 20 06:02:22 2017 -0500

2.0.0-BETA1

#### Another tweak
Expand Down Expand Up @@ -89,7 +89,7 @@ Date: Mon Jul 10 07:35:10 2017 -0500
#### More cleanup for 2.x
commit 086098cdf80204c38314ac672bd07750665b53fc<br/>
Author: isuPatches <[email protected]><br/>
Date: Mon Jul 10 07:30:16 2017 -0500
Date: Mon Jul 10 07:30:16 2017 -0500

#### Update travis.yml
commit 1df8e7be3bf747a612699a3b0e1502cb46281ebd<br/>
Expand All @@ -100,13 +100,13 @@ Date: Sun Jul 9 14:36:51 2017 -0500
commit 55af07095ee92166261afd27dd856293bb2acbe1<br/>
Merge: 9cb52a6 0a3cc80<br/>
Author: isuPatches <[email protected]><br/>
Date: Sun Jul 9 14:23:10 2017 -0500
Date: Sun Jul 9 14:23:10 2017 -0500

#### Start of 2.x
commit 0a3cc801f8f030ed30419b698f9d8f96eca9df5b<br/>
Author: isuPatches <[email protected]><br/>
Date: Sun Jul 9 14:22:23 2017 -0500

close #58
close #59
close #60
Expand Down

0 comments on commit 075f505

Please sign in to comment.