Merge branch 'master' into tmp

jbasdf · Apr 10, 2009 · a2046ca · a2046ca
2 parents 19cefc7 + e2bc945
commit a2046ca
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 61 deletions.
diff --git a/app/apis/backend_api.rb b/app/apis/backend_api.rb
diff --git a/app/apis/blogger_api.rb b/app/apis/blogger_api.rb
diff --git a/app/apis/blogger_structs/blog.rb b/app/apis/blogger_structs/blog.rb
diff --git a/app/apis/blogger_structs/post.rb b/app/apis/blogger_structs/post.rb
diff --git a/app/apis/blogger_structs/user.rb b/app/apis/blogger_structs/user.rb
diff --git a/themes/default/content/pages/test.html b/themes/default/content/pages/test.html
@@ -0,0 +1 @@
+this is a test