merge

h4ck3rm1k3 · Dec 19, 2013 · 0a41237 · 0a41237
2 parents 79179ef + c5e4d91
commit 0a41237
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 1,477 deletions.
diff --git a/lawrence_creates/.gitignore b/lawrence_creates/.gitignore
@@ -0,0 +1,7 @@
+*.pyc
+*.pyo
+*.db
+.DS_Store
+.coverage
+local_settings.py
+/static
diff --git a/lawrence_creates/.hgignore b/lawrence_creates/.hgignore
@@ -0,0 +1,10 @@
+syntax: glob
+*.pyc
+*.pyo
+*.db
+.DS_Store
+.coverage
+local_settings.py
+
+syntax: regexp
+^static/
diff --git a/lawrence_creates/keepalive.sh b/lawrence_creates/keepalive.sh
diff --git a/lawrence_creates/lawrence_creates_v1.json → lawrence_creates/lawrence_creates_v0.json b/lawrence_creates/lawrence_creates_v1.json → lawrence_creates/lawrence_creates_v0.json
@@ -264,8 +264,8 @@
     "pk": 1, 
     "model": "sites.site", 
     "fields": {
-        "domain": "127.0.0.1:8000", 
-        "name": "Default"
+        "domain": "blog.lawrencecreates.thefr33.com", 
+        "name": "Lawrence Creates"
     }
 },
 {
@@ -405,7 +405,7 @@
         "status": 2, 
         "login_required": false, 
         "updated": null, 
-        "_order": 2, 
+        "_order": 3, 
         "titles": "Contact", 
         "description": "Fill in the form below to get in touch with us.", 
         "parent": null, 
@@ -1340,54 +1340,13 @@
 },
 {
     "pk": 1, 
-    "model": "admin.logentry", 
-    "fields": {
-        "action_flag": 2, 
-        "action_time": "2013-12-19T12:55:28.694Z", 
-        "object_repr": "About", 
-        "object_id": "2", 
-        "change_message": "Changed content and keywords.", 
-        "user": 1, 
-        "content_type": 21
-    }
-},
-{
-    "pk": 2, 
-    "model": "admin.logentry", 
-    "fields": {
-        "action_flag": 2, 
-        "action_time": "2013-12-19T12:56:05.458Z", 
-        "object_repr": "About", 
-        "object_id": "2", 
-        "change_message": "Changed content, description and keywords.", 
-        "user": 1, 
-        "content_type": 21
-    }
-},
-{
-    "pk": 3, 
-    "model": "admin.logentry", 
-    "fields": {
-        "action_flag": 2, 
-        "action_time": "2013-12-19T12:56:25.203Z", 
-        "object_repr": "About", 
-        "object_id": "2", 
-        "change_message": "Changed content and keywords.", 
-        "user": 1, 
-        "content_type": 21
-    }
-},
-{
-    "pk": 4, 
-    "model": "admin.logentry", 
-    "fields": {
-        "action_flag": 3, 
-        "action_time": "2013-12-19T13:04:45.283Z", 
-        "object_repr": "Gallery", 
-        "object_id": "8", 
-        "change_message": "", 
-        "user": 1, 
-        "content_type": 20
+    "model": "core.sitepermission", 
+    "fields": {
+        "user": 2, 
+        "sites": [
+            1
+        ]
     }
 }
+
 ]