Compare commits
	
		
			No commits in common. "c54fef010f3301e70987e6d149106b0c1f45d01c" and "ed4674f72129ae82fd4d759885368b360d93780b" have entirely different histories.
		
	
	
		
			c54fef010f
			...
			ed4674f721
		
	
		
							
								
								
									
										32
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						
									
										32
									
								
								LICENSE
									
									
									
									
									
								
							| @ -1,32 +1,3 @@ | ||||
| At your option you may choose either of the following licenses: | ||||
| 
 | ||||
|   * The MIT License (MIT) | ||||
|   * The Apache License 2.0 (Apache-2.0) | ||||
| 
 | ||||
| 
 | ||||
| The MIT License (MIT) | ||||
| 
 | ||||
| Copyright (c) 2015 AJ ONeal | ||||
| 
 | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to whom the Software is | ||||
| furnished to do so, subject to the following conditions: | ||||
| 
 | ||||
| The above copyright notice and this permission notice shall be included in all | ||||
| copies or substantial portions of the Software. | ||||
| 
 | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||
| SOFTWARE. | ||||
| 
 | ||||
| 
 | ||||
|                                  Apache License | ||||
|                            Version 2.0, January 2004 | ||||
|                         http://www.apache.org/licenses/ | ||||
| @ -215,7 +186,7 @@ SOFTWARE. | ||||
|       same "printed page" as the copyright notice for easier | ||||
|       identification within third-party archives. | ||||
| 
 | ||||
|    Copyright 2015 AJ ONeal | ||||
|    Copyright {yyyy} {name of copyright owner} | ||||
| 
 | ||||
|    Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|    you may not use this file except in compliance with the License. | ||||
| @ -228,3 +199,4 @@ SOFTWARE. | ||||
|    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|    See the License for the specific language governing permissions and | ||||
|    limitations under the License. | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										15
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								README.md
									
									
									
									
									
								
							| @ -1,3 +1,18 @@ | ||||
| <!-- BANNER_TPL_BEGIN --> | ||||
| 
 | ||||
| About Daplie: We're taking back the Internet! | ||||
| -------------- | ||||
| 
 | ||||
| Down with Google, Apple, and Facebook! | ||||
| 
 | ||||
| We're re-decentralizing the web and making it read-write again - one home cloud system at a time. | ||||
| 
 | ||||
| Tired of serving the Empire? Come join the Rebel Alliance: | ||||
| 
 | ||||
| <a href="mailto:jobs@daplie.com">jobs@daplie.com</a> | [Invest in Daplie on Wefunder](https://daplie.com/invest/) | [Pre-order Cloud](https://daplie.com/preorder/), The World's First Home Server for Everyone | ||||
| 
 | ||||
| <!-- BANNER_TPL_END --> | ||||
| 
 | ||||
| Unibabel | ||||
| ======== | ||||
| 
 | ||||
|  | ||||
| @ -1,7 +1,7 @@ | ||||
| { | ||||
|   "name": "unibabel", | ||||
|   "main": "index.js", | ||||
|   "version": "2.1.4", | ||||
|   "version": "2.1.3", | ||||
|   "homepage": "https://github.com/coolaj86/unibabel-js", | ||||
|   "authors": [ | ||||
|     "AJ ONeal <awesome@coolaj86.com>" | ||||
|  | ||||
							
								
								
									
										12
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								package.json
									
									
									
									
									
								
							| @ -1,6 +1,6 @@ | ||||
| { | ||||
|   "name": "unibabel", | ||||
|   "version": "2.1.4", | ||||
|   "version": "2.1.3", | ||||
|   "description": "Base64, TypedArrays, and UTF-8 / Unicode conversions in Browser (and Node) JavaScript", | ||||
|   "main": "node.js", | ||||
|   "browser": { | ||||
| @ -11,7 +11,7 @@ | ||||
|   }, | ||||
|   "repository": { | ||||
|     "type": "git", | ||||
|     "url": "git+https://git.coolaj86.com/coolaj86/unibabel.js.git" | ||||
|     "url": "git+https://github.com/coolaj86/unibabel-js.git" | ||||
|   }, | ||||
|   "keywords": [ | ||||
|     "ascii", | ||||
| @ -28,10 +28,10 @@ | ||||
|     "Base32", | ||||
|     "b32" | ||||
|   ], | ||||
|   "author": "AJ ONeal <coolaj86@gmail.com> (https://coolaj86.com/)", | ||||
|   "license": "(MIT OR Apache-2.0)", | ||||
|   "author": "AJ ONeal <coolaj86@gmail.com> (http://coolaj86.com/)", | ||||
|   "license": "Apache-2.0", | ||||
|   "bugs": { | ||||
|     "url": "https://git.coolaj86.com/coolaj86/unibabel.js/issues" | ||||
|     "url": "https://github.com/coolaj86/unibabel-js/issues" | ||||
|   }, | ||||
|   "homepage": "https://git.coolaj86.com/coolaj86/unibabel.js#readme" | ||||
|   "homepage": "https://github.com/coolaj86/unibabel-js#readme" | ||||
| } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user