Commit cffc200

committed

Merge branch 'v1' into v2, accepting v1 where conflicted.

2 parents b5431ba + d76c1d5 commit cffc200Copy full SHA for cffc200

5 files changed

+4836

-16

lines changed

docs
- art/user-guide
  - adobe-to-enterprise-connections.ai
- user-manual/media
  - adobe-to-enterprise-connections.png
setup.py
user_sync
- connector
  - dashboard.py
- rules.py

5 files changed

+4836

-16

lines changed

Comments

(0)