6e174cc2c4
Conflicts: erpnext/setup/doctype/notification_control/notification_control.js index.html version.num |
||
---|---|---|
.. | ||
before_jan_2012 | ||
jan_mar_2012 | ||
old_patches | ||
print_formats | ||
__init__.py | ||
patch_list.py | ||
patch.py |
6e174cc2c4
Conflicts: erpnext/setup/doctype/notification_control/notification_control.js index.html version.num |
||
---|---|---|
.. | ||
before_jan_2012 | ||
jan_mar_2012 | ||
old_patches | ||
print_formats | ||
__init__.py | ||
patch_list.py | ||
patch.py |