Permalink
Browse files

fixed merge conflict, app creation and deletion and domains

  • Loading branch information...
2 parents 53d3c15 + f1b9eb1 commit 9b077a6e3c2dff8d10abef1fc6aa1566d2705b58 @Kevnz Kevnz committed Mar 6, 2012
Showing with 504 additions and 516 deletions.
  1. +0 −1 lib/nodester-api.js
  2. +322 −251 public/javascripts/main.js
  3. +41 −155 public/stylesheets/style.css
  4. +81 −43 views/frontend-templates.jade
  5. +0 −1 views/index.jade
  6. +55 −57 views/layout.jade
  7. +5 −0 views/nav.jade
  8. +0 −8 views/sidebar.jade
View
@@ -61,7 +61,6 @@ function request(method, path, data, credentials, callback) {
console.log("formatted path ===> ", formattedPath);
console.log("method ===> ", method);
console.log("params ===> ", data);
- console.log("query string ===> ", queryString);
}
var options = {
Oops, something went wrong.

0 comments on commit 9b077a6

Please sign in to comment.