Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Fixed mistake made when resolving merge conflict #3

Merged
merged 11 commits into from Jan 3, 2012

Conversation

Projects
None yet
2 participants

elrik commented Jan 3, 2012

Let's try this again buddy

Nikola Trandafilovic added some commits Jan 2, 2012

Nikola Trandafilovic Added method for getting list of required and dependant apps
and extended uninstall to remove apps that are dependant
on the package that is selected for removal
806ff76
Nikola Trandafilovic Added details page that shows dependencies and requirements of the se…
…lected package
ab6419a
Nikola Trandafilovic Added details view 4a4f54d
Nikola Trandafilovic Added url for application details 6b8755d
Nikola Trandafilovic Readded accidentally deleted lines 5e1936f
Nikola Trandafilovic Merge branch 'master' of git://github.com/redhog/appomatic
Conflicts:
	appomatic_appadmin/appomatic_appadmin/__urls__.py
	appomatic_appadmin/appomatic_appadmin/views.py
f6f1f8c
Nikola Trandafilovic Added init file in the css dir, so now it will be included when runin…
…g setup.py install
a0334b5
Nikola Trandafilovic Minor bugfix. Someone has forgotten to put quotes cb675a9
Nikola Trandafilovic Bit of spring... uhh winter cleaning 9039612
Nikola Trandafilovic Bugfix for syncdb. This avoids syncdb hanging and waiting for the inp…
…ut from the user
e982586
Nikola Trandafilovic Fixed mistake made by resolving merge conflict.
Also popup window will now display progress of uinstallation of dependant apps as well
56a21d8

@redhog redhog pushed a commit that referenced this pull request Jan 3, 2012

Egil Möller Merge pull request #3 from elrik/master
Fixed mistake made when resolving merge conflict
54d6d95

@redhog redhog merged commit 54d6d95 into redhog:master Jan 3, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment