Merge branch 'master' of 192.168.0.7:/home/tim/gitsrc/open_pdks/

Pull before push
diff --git a/sky130/magic/sky130.tech b/sky130/magic/sky130.tech
index d8d3c41..051c7f1 100644
--- a/sky130/magic/sky130.tech
+++ b/sky130/magic/sky130.tech
@@ -967,6 +967,9 @@
 	or alldiffmv,mvvar
 	grow	185
         bloat-all alldiffmv nwell
+	bridge	700 600
+ 	grow 	345
+ 	shrink 	345
 	# (HVI min width rule is 0.6 but CNTM min width rule is 0.84um)
 	grow-min 840
 	# grow-min 600