added about us page and settings

2026-05-06 23:10:26 +00:00 · 2012-12-27 16:50:24 +05:30
parent 5f1d57ecb7 a85b2e4ee3
commit 1b1517155b
33 changed files with 571 additions and 316 deletions
--- a/patches/patch_list.py
+++ b/patches/patch_list.py
@@ -560,6 +560,10 @@ patch_list = [
 	},
 	{
 		'patch_module': 'patches.december_2012',
+<<<<<<< HEAD
 		'patch_file': 'address_title',
+=======
+		'patch_file': 'delete_form16_print_format',
+>>>>>>> a85b2e4ee349c544acb7a1949351e9a7c70f7b7c
 	},
 ]