Permalink
Browse files

Merge branch 'master' of https://github.com/rosUnix/django-foursquare…

…-website

Conflicts:
	fivesquares/foursquareapi/templates/foursquareapi/query.html
  • Loading branch information...
2 parents 3562031 + 3a73936 commit 130b30644b46c1a0f560173c046c588ec0e95dee @pablorecio committed Dec 18, 2011
@@ -6,7 +6,7 @@
<div class="container">
<div class="row">
<div class="span6 form">
- <form action="{% url home %}" method="post" id="search-form">{% csrf_token %}
+ <form action="{% url query %}" method="post" id="search-form">{% csrf_token %}
<fieldset>
<div class="search position">
<legend>{% trans "¿Donde estás?" %}</legend>
View
@@ -168,4 +168,4 @@
try:
from local_settings import *
except ImportError:
- pass
+ pass
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 130b306

Please sign in to comment.