diff options
author | Micah Anderson <micah@riseup.net> | 2013-06-21 14:03:42 -0400 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2013-06-21 14:03:42 -0400 |
commit | 707fbf5d30a0b71cd55f2f02982a2b4ff28e1ece (patch) | |
tree | a2bdce09b59bd8e10cc3c651d9a713fb5e570689 /provider_base/files/service-definitions/provider.json.erb | |
parent | 52c79fd7d25c33637197f08a8b7736fdc8a83414 (diff) | |
parent | c69053bffc18f277e1119efcf9fff3d1e95de7fa (diff) |
Merge branch 'develop' into leap
Diffstat (limited to 'provider_base/files/service-definitions/provider.json.erb')
0 files changed, 0 insertions, 0 deletions