nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 00:44:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into edge

Browse Source 
Conflicts:
	setup/doctype/backup_manager/backup_dropbox.py
This commit is contained in:
Anand Doshi
2013-03-22 18:43:47 +05:30
parent 3f725308e1 b632ba5f51
commit aeed499d12
10 changed files with 64 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/templates/pages/contact.html
View File

@@ -19,7 +19,7 @@
</div>
<div class="clearfix"></div>
<p><select class="span6" name="subject">
{% for option in obj.doc.query_options %}
{% for option in obj.query_options %}
<option value="{{ option }}">{{ option }}</option>
{% endfor %}
</select></p>