Skip to content
Browse files

Merge branch 'master' of github.com:tractorfeed/HswApi into bill_find…

…erizer
  • Loading branch information...
2 parents d23c6a1 + e8c6e59 commit e7872a3d33be780c619c6e05c539314d519fd452 @prefork prefork committed
Showing with 2 additions and 2 deletions.
  1. +1 −1 .gitignore
  2. +1 −1 app.rb
  3. 0 script/sql/.keep
View
2 .gitignore
@@ -1,3 +1,3 @@
.DS_Store
.idea/*
-script/sql/*
+script/sql/*.sql
View
2 app.rb
@@ -47,7 +47,7 @@ def jsonp(body)
if(settings.things.has_key? params[:thing])
finder = settings.things[params[:thing]].dup
item = finder.find(params[:id])
- if item # exists! # HELLO NATTHEW. HOW ARE YOU? -rmn
+ if item # exists!
itemj = item.export.to_json
etag Digest::SHA1.base64digest itemj
jsonp itemj
View
0 script/sql/.keep
No changes.

0 comments on commit e7872a3

Please sign in to comment.
Something went wrong with that request. Please try again.