Merge branch 'master' into develop

# Conflicts: # README.md
zydeco · Jan 27, 2019 · b26dda8 · b26dda8
2 parents 7674299 + a93e058
commit b26dda8
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -94,9 +94,9 @@ place to support the extra buttons. They are provided for compatibility with Pro
 These combinations are temporary, and will be removed in a future version, once there is an API in
 place to support combinations of steam+button:
 
-- L-Pad Toggle: `◉ L-Pad Click` + `◀︎ Back`: toggles requiring click for input
-- R-Pad Toggle: `◉ R-Pad Click` + `▶︎ Forward`: toggles requiring click for input
-- Stick Toggle: `◉ Stick Click` + `◀︎ Back`: toggles between d-pad and left thumbstick mapping
+- L-Pad Toggle: ◉ L-Pad Click + ◀︎ Back: toggles requiring click for input
+- R-Pad Toggle: ◉ R-Pad Click + ▶︎ Forward: toggles requiring click for input
+- Stick Toggle: ◉ Stick Click + ◀︎ Back: toggles between d-pad and left thumbstick mapping
 <br><sup> Combo order is specific if you want to avoid misfiring buttons.</sup><br>
 
 ## License