Merge branch 'master' of https://github.com/tpcstld/2048

tpcstld · Feb 25, 2015 · dc5a522 · dc5a522
2 parents 0aabbe7 + e756622
commit dc5a522
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) {{{year}}} {{{fullname}}}
+Copyright (c) 2014 Jerry Jiang
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -11,4 +11,4 @@ Original code: https://github.com/gabrielecirulli/2048
 
 Download from Google Play: https://play.google.com/store/apps/details?id=com.tpcstld.twozerogame
 
-Used under MIT License.
+Use governed by the MIT License.