Permalink
Browse files

Merge branch 'master' of https://github.com/Illutron/IllutronDashboard

  • Loading branch information...
HalfdanJ committed Oct 10, 2011
2 parents 6ea2920 + 3083f10 commit 47c1d8d02159956b653181c27e1e66edb1b40288
Showing with 3 additions and 2 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 apps/log/views.py
View
@@ -3,4 +3,5 @@
.idea
*pyc
*~
+media
settings_local.py
View
@@ -34,8 +34,8 @@ def member(request, id):
log_list = []
for log in log_entries:
log_list.append({
- 'latitude': log.latitude,
- 'longitude': log.longitude,
+ #'latitude': log.latitude,
+ #'longitude': log.longitude,
'on_illutron': log.on_illutron,
'time': log.time.isoformat(),
'description': log.description

0 comments on commit 47c1d8d

Please sign in to comment.