Rushabh Mehta 99d3966cd6 [merge] conflicts		2014-10-21 12:34:57 +05:30
..
conf.py	-webnotes +frappe 💥	2014-02-14 14:55:11 +05:30
Framework.sql	[merge] conflicts	2014-10-21 12:34:57 +05:30
GeoIP.dat	-webnotes +frappe 💥	2014-02-14 14:55:11 +05:30
languages.txt	Merge pull request #784 from geo-poland/basic-polish-language-support	2014-08-20 13:37:37 +05:30
sample_site_config.json	Append X-Frappe-Site header in outgoing email	2014-08-27 12:22:25 +05:30