Sahil Khan 9b65a7c4a1 Merge branch 'version-12-hotfix' into merge_v12_hotfix_1		2019-08-20 16:09:39 +05:30
..
emails	fix: Unknown string format:', u'Total'	2019-07-26 15:13:52 +05:30
form_grid	Upgrade Font Awesome (#2410)	2016-12-05 13:07:03 +05:30
includes	Fix: Add translation function to strings (#8023)	2019-08-05 13:06:48 +05:30
pages	fix: Remove no_sitemap flag	2019-03-19 20:34:19 +05:30
print_formats	fix: Add prefix print in attribute names	2019-08-07 18:10:58 +05:30
styles	fix(Print): Show warning for column overflow	2019-08-08 22:14:10 +05:30
test	feat: Allow website templates to have different base templates (#6811)	2019-01-27 20:46:23 +05:30
__init__.py	-webnotes +frappe 💥	2014-02-14 14:55:11 +05:30
base.html	feat(template): add frappe-content-type for markdown	2019-08-20 11:09:36 +05:30
web.html	fix: Add wrapper and block for overrides (#7889)	2019-07-15 16:55:25 +05:30