Akhilesh Darjee 60ae96d588 [fix] [minor] merge conflict fixed

2013-11-26 11:21:07 +05:30

..

js

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

__init__.py

…

accounts_controller.py

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

buying_controller.py

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

queries.py

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

selling_controller.py

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

status_updater.py

[copyright] added Contributors

2013-11-20 13:00:28 +05:30

stock_controller.py

[minor] merge conflict fixed

2013-11-21 12:28:50 +05:30

trends.py

[fix] [setup_wizard] fiscal year fix for setup wizard

2013-11-25 19:51:18 +05:30