Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

bug 642873 Bug/642873 #130

Merged
merged 21 commits into from Apr 22, 2011
Merged

bug 642873 Bug/642873 #130

merged 21 commits into from Apr 22, 2011

Conversation

rafrombrc
Copy link
Member

this is a fairly sizeable set of changes to the linkdrop code so that it will work w/ the "service status"-related changes in the linkoauth library.

billrest and others added 21 commits March 30, 2011 20:17
Conflicts:
	Makefile
	build.py
	linkdrop/controllers/contacts.py
	linkdrop/controllers/send.py
	linkdrop/tests/services/test_playback.py
Conflicts:
	linkdrop/tests/services/test_playback.py
…ge the

controllers to use get_services() instead of just importing services.
…n the services

that we actually plan on deploying.
Conflicts:
	linkdrop/controllers/contacts.py
	linkdrop/tests/services/test_playback.py
	test.ini
@rafrombrc rafrombrc merged commit 25783ef into develop Apr 22, 2011
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants