Merge branch 'main' into feature/109-error-unauthorized

readme.txt

@@ -4,7 +4,11 @@ Contributors: cmanon, jrfoell, lancewillett, dlintott, sebastianerb
 Tags: strava, activity, bicycle, cycling, biking, running, run, swimming, swim, paddle, kayak, gps, shortcode, widget, plugin, block, blocks
 Requires at least: 4.6
 Tested up to: 5.8
+<<<<<<< HEAD
 Stable tag: 2.10.2-beta1
+=======
+Stable tag: 2.11.0
+>>>>>>> @{-1}
 Requires PHP: 5.3
 License: GPLv2 or later
 
@@ -134,9 +138,12 @@ On the WP-Strava settings page you cannot currently remove and add another athle
 
 == Changelog ==
 
-= 2.10.2 =
+= 2.12.0-beta1 =
 Added debugging for API POST to troubleshoot 401 errors https://wordpress.org/support/topic/wp-strava-error-401-unauthorized/
 
+= 2.11.0 =
+Add additional block transformations for "Activity" (from: Paragraph, Classic Shortcode; to: Paragraph)
+Add Mapbox Static Map support https://github.com/cmanon/wp-strava/issues/26
 
 = 2.10.1 =
 Reworked settings save with multiple athletes, related to https://wordpress.org/support/topic/wp-strava-error-401-unauthorized/