summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2017-12-31 17:04:30 +0100
committerschneefux <schneefux+commit@schneefux.xyz>2017-12-31 17:04:30 +0100
commit90346424a81cfe3e54d2c2cf84378d88547e25f1 (patch)
tree9c12bdc7291727a60a773f86171c553f47935e4c
parentc3ae936e0addd75855557b99f44590ed611923f4 (diff)
parent2a74b09a1bdefd7f8fa23fa72a7bdf2b3cf4f68f (diff)
downloadmeta-develop.tar.gz
meta-develop.zip
Merge branch 'master' into developdevelop
m---------bridge0
m---------orm0
2 files changed, 0 insertions, 0 deletions
diff --git a/bridge b/bridge
-Subproject 1da936f56a6ae9fd27f236b5ebac166d26f4588
+Subproject 2183814f78aa7f5b85630bcbb8c9ea15d1f47be
diff --git a/orm b/orm
-Subproject 5ba42c3cd059d725a26b8d4967bc0278208e1e1
+Subproject 05a19fb2a801152bd54431ca3ac6e5493b0c24d