Merge remote-tracking branch 'origin/master' into elliott/static-pin

# Conflicts: # src/typings/index.ts
openspacelabs · Sep 16, 2024 · d695e85 · d695e85
2 parents 3d99b21 + cd41cca
commit d695e85
Show file tree

Hide file tree

Showing 17 changed files with 88 additions and 32 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,7 @@
 MIT License
 
-Copyright (c) 2018 Open Space Labs, Inc.
+Copyright (c) 2018 DuAgentur
+Copyright (c) 2021 Open Space Labs, Inc.
 
 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/lib/commonjs/ReactNativeZoomableView.js b/lib/commonjs/ReactNativeZoomableView.js
diff --git a/lib/commonjs/ReactNativeZoomableView.js.map b/lib/commonjs/ReactNativeZoomableView.js.map
diff --git a/lib/commonjs/ReactNativeZoomableViewWithGestures.js b/lib/commonjs/ReactNativeZoomableViewWithGestures.js
diff --git a/lib/commonjs/ReactNativeZoomableViewWithGestures.js.map b/lib/commonjs/ReactNativeZoomableViewWithGestures.js.map
diff --git a/lib/commonjs/typings/index.js.map b/lib/commonjs/typings/index.js.map