On Thu, 2010-09-23 at 20:20 +0200, [email protected] wrote:
> From: Tomas Sedovic <[email protected]>
> 
> ---
>  src/app/controllers/cloud_accounts_controller.rb |   53 +++++++++-
>  src/app/models/quota.rb                          |    3 +
>  src/app/stylesheets/aggregator.scss              |    6 +
>  src/app/views/provider/_providers.haml           |    2 +-
>  src/app/views/provider/accounts.haml             |  114 +++++++++++++++++----
>  src/config/locales/en.yml                        |   14 +++
>  6 files changed, 165 insertions(+), 27 deletions(-)

This patch does not apply, please rebase and resend both (you can wait
until I am on if you want, to decrease chance of another conflict - I
will test it first thing, as soon as you send it).

-j

_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel

Reply via email to