3b0474f7dd10504d5254e5693332383a3c044458 d6fcacba58ae34a9ace80c52a14e2cd937d97908 shiwali <shiwali@braintechnosys.biz> 1662375544 +0800	merge origin/master: Fast-forward
d6fcacba58ae34a9ace80c52a14e2cd937d97908 2b0ad177252150a19beaf7a56a26bdca1a41fcb1 shiwali <shiwali@braintechnosys.biz> 1662376501 +0800	commit: commit changes on sancy superfasttech server
2b0ad177252150a19beaf7a56a26bdca1a41fcb1 f22134059bc482399196f9ab0fd91131d11ddaf1 shiwali <shiwali@braintechnosys.biz> 1662376800 +0800	commit (merge): resolve conflict in job 10 mmigration
f22134059bc482399196f9ab0fd91131d11ddaf1 fd86aa92e4a25bc0a415d58f176278dfa8dea5e3 shiwali <shiwali@braintechnosys.biz> 1662530249 +0800	pull: Fast-forward
fd86aa92e4a25bc0a415d58f176278dfa8dea5e3 71259f55d4b066a14b19bbd834be7e5fe059c820 shiwali <shiwali@braintechnosys.biz> 1662614133 +0800	pull origin master: Fast-forward
71259f55d4b066a14b19bbd834be7e5fe059c820 563d818a58abb773c1684860a8cf86f6521ac7d1 shiwali <shiwali@braintechnosys.biz> 1662614973 +0800	pull origin master: Fast-forward
563d818a58abb773c1684860a8cf86f6521ac7d1 e4d56842959093519d2376482c6266a33a4157aa shiwali <shiwali@braintechnosys.biz> 1662978190 +0800	pull origin master: Fast-forward
e4d56842959093519d2376482c6266a33a4157aa 8a4e16b35e31a6ceb710e42f693d623fa2de2ccf shiwali <shiwali@braintechnosys.biz> 1663054674 +0800	pull origin master: Fast-forward
8a4e16b35e31a6ceb710e42f693d623fa2de2ccf e18231d1d585cbcedd573867e990fb82b95b61e7 shiwali <shiwali@braintechnosys.biz> 1663075723 +0800	pull origin master: Fast-forward
e18231d1d585cbcedd573867e990fb82b95b61e7 ad501f4fce18cc4b3b4f6db3a0b090b04265eb6b shiwali <shiwali@braintechnosys.biz> 1663138873 +0800	pull origin master: Fast-forward
ad501f4fce18cc4b3b4f6db3a0b090b04265eb6b 23be8433dd96bc11935c271a0ecf1b98a99b6d1d shiwali <shiwali@braintechnosys.biz> 1663158206 +0800	pull origin master: Fast-forward
23be8433dd96bc11935c271a0ecf1b98a99b6d1d 97183fdb72be2903acdda26fd0c0c7e4aebb7b8e shiwali <shiwali@braintechnosys.biz> 1664191020 +0800	pull origin master: Fast-forward
97183fdb72be2903acdda26fd0c0c7e4aebb7b8e d0e22baa8c114e570596e1623a169b2ab5e97cd5 shiwali <shiwali@braintechnosys.biz> 1664198835 +0800	commit: commit changes on client server
d0e22baa8c114e570596e1623a169b2ab5e97cd5 e90c30d501b4dce4163e30836c3659af18846490 shiwali <shiwali@braintechnosys.biz> 1665038659 +0800	pull origin master: Fast-forward
e90c30d501b4dce4163e30836c3659af18846490 76e4e47f778f3126c42551ecd402b8dfcfaaa136 shiwali <shiwali@braintechnosys.biz> 1665041825 +0800	pull origin master: Fast-forward
76e4e47f778f3126c42551ecd402b8dfcfaaa136 2958a7e17c71105e817a0cd0f065835461b96d7c shiwali <shiwali@braintechnosys.biz> 1665042744 +0800	pull origin master: Fast-forward
2958a7e17c71105e817a0cd0f065835461b96d7c 8a434a7d08d2862b17345c848c058cbcaf6bc70c shiwali <shiwali@braintechnosys.biz> 1665043203 +0800	commit: commit changes in add jewellery images
8a434a7d08d2862b17345c848c058cbcaf6bc70c 0eaacbd41b9f6f6211aca5aa68375d1a2f7f3616 shiwali <shiwali@braintechnosys.biz> 1665044069 +0800	pull origin master: Fast-forward
0eaacbd41b9f6f6211aca5aa68375d1a2f7f3616 9793628835ea19124a9e0016de41fa8fb57e6950 shiwali <shiwali@braintechnosys.biz> 1665048547 +0800	pull origin master: Fast-forward
9793628835ea19124a9e0016de41fa8fb57e6950 364cd516a4b769ab24c38a993a2aa0eeee3fccd9 shiwali <shiwali@braintechnosys.biz> 1665405751 +0800	pull origin master: Fast-forward
364cd516a4b769ab24c38a993a2aa0eeee3fccd9 8f6c02f7e44a7667950ef000deef8e97c87a7897 shiwali <shiwali@braintechnosys.biz> 1666168941 +0800	pull origin master: Fast-forward
8f6c02f7e44a7667950ef000deef8e97c87a7897 b0f4c2fa2590abe9ff5abb50e24a74fe79844a89 shiwali <shiwali@braintechnosys.biz> 1666850306 +0800	pull origin master: Fast-forward
b0f4c2fa2590abe9ff5abb50e24a74fe79844a89 162cd06f785c186fbbeb80867c2a592a910b31df shiwali <shiwali@braintechnosys.biz> 1666850935 +0800	pull origin master: Fast-forward
162cd06f785c186fbbeb80867c2a592a910b31df cae16d7ba8458e9d2f3502d555826e078baa55c1 shiwali <shiwali@braintechnosys.biz> 1666860871 +0800	commit: commit chnages on client server for permission issue in sidebar in admin module
cae16d7ba8458e9d2f3502d555826e078baa55c1 05a65b7119b0189b67c0f95f2e7ef573150d4f68 shiwali <shiwali@braintechnosys.biz> 1666866159 +0800	pull origin master: Fast-forward
05a65b7119b0189b67c0f95f2e7ef573150d4f68 5e38ae2ddf01c0b8bdd54cbe5b27d5cd3b6a2114 shiwali <shiwali@braintechnosys.biz> 1666869399 +0800	pull origin master: Fast-forward
5e38ae2ddf01c0b8bdd54cbe5b27d5cd3b6a2114 fc948f9f6d655b695b1044d0b20a4f11c0155966 shiwali <shiwali@braintechnosys.biz> 1667797817 +0800	pull origin master: Fast-forward
fc948f9f6d655b695b1044d0b20a4f11c0155966 6fe55dc7b35282b8d385d9478e6f04213ccab926 shiwali <shiwali@braintechnosys.biz> 1667801191 +0800	commit: commit change on client server
6fe55dc7b35282b8d385d9478e6f04213ccab926 4a38dcc6957429582072a7204c3730917595764f shiwali <shiwali@braintechnosys.biz> 1667801358 +0800	commit (merge): conflict resolved in composer lock file
4a38dcc6957429582072a7204c3730917595764f c6bee9446c49dd9cc343b6f08ac3b99458f66677 shiwali <shiwali@braintechnosys.biz> 1667803254 +0800	pull origin master: Fast-forward
c6bee9446c49dd9cc343b6f08ac3b99458f66677 cb8d0f7b6c6f049bcb5c663e8c0a824624b1f57f shiwali <shiwali@braintechnosys.biz> 1667810112 +0800	commit: commit changes in admin sidebar
cb8d0f7b6c6f049bcb5c663e8c0a824624b1f57f 68cba9baf1e9a59bbd547ecdd0368ac1bc28aa6b shiwali <shiwali@braintechnosys.biz> 1667810774 +0800	pull origin master: Fast-forward
68cba9baf1e9a59bbd547ecdd0368ac1bc28aa6b a8169b8ae3e3f6b6f8f97eb4fb69d1a259c90fbd shiwali <shiwali@braintechnosys.biz> 1667888991 +0800	commit: commit chnages in permission middleware on client server
a8169b8ae3e3f6b6f8f97eb4fb69d1a259c90fbd 4ba6fff5ea903aede2dac91e44774c16de1ed955 shiwali <shiwali@braintechnosys.biz> 1667889135 +0800	commit (merge): commit changes on client ser ver after pull
4ba6fff5ea903aede2dac91e44774c16de1ed955 6afbbc8603b70cac0de9608153ab5f4a9e8eeb85 shiwali <shiwali@braintechnosys.biz> 1668489470 +0800	pull origin master: Fast-forward
6afbbc8603b70cac0de9608153ab5f4a9e8eeb85 3384354e91eeade82482ad28d7dc59e7a8ebaf66 shiwali <shiwali@braintechnosys.biz> 1668503164 +0800	commit: commit changes in aadmin quotation order voucher print and pdf
3384354e91eeade82482ad28d7dc59e7a8ebaf66 b918f538a8bad3727013e9db51b3ee2f7904f665 shiwali <shiwali@braintechnosys.biz> 1669202666 +0800	commit: commit changes in getItemDatas rfid api
b918f538a8bad3727013e9db51b3ee2f7904f665 8876b3b6f99fa8935d98ddd89f586ddb9162d7e9 shiwali <shiwali@braintechnosys.biz> 1669203110 +0800	commit (merge): commitc hanges on live on client server
8876b3b6f99fa8935d98ddd89f586ddb9162d7e9 26806132ab4c658a7da41aa76a903dd324e528e5 shiwali <shiwali@braintechnosys.biz> 1669361492 +0800	pull origin master: Fast-forward
26806132ab4c658a7da41aa76a903dd324e528e5 8926d88b80c3a7f4b4126a92191d6f9c90a1736d shiwali <shiwali@braintechnosys.biz> 1669722424 +0800	pull origin master: Fast-forward
8926d88b80c3a7f4b4126a92191d6f9c90a1736d 3f6352e7d114d9f34c3eb230f20782edd67f2cc6 shiwali <shiwali@braintechnosys.biz> 1669809893 +0800	commit: commit chnages on server
3f6352e7d114d9f34c3eb230f20782edd67f2cc6 850481534e6bd73f22cd0920c60c488c2228559f shiwali <shiwali@braintechnosys.biz> 1669810444 +0800	commit (merge): conflict resolved on admin invoice payment pop up
850481534e6bd73f22cd0920c60c488c2228559f 9a06248929adfd763fbd014a4496d63631d8990f shiwali <shiwali@braintechnosys.biz> 1669810551 +0800	pull origin master: Fast-forward
9a06248929adfd763fbd014a4496d63631d8990f 781e4a301105a07ef6ab3aee25065c8eb8a33b22 shiwali <shiwali@braintechnosys.biz> 1669890978 +0800	pull origin master: Fast-forward
781e4a301105a07ef6ab3aee25065c8eb8a33b22 3315172ea9ddd79ac1fceff8f6e96b7c261906a5 shiwali <shiwali@braintechnosys.biz> 1670306882 +0800	pull origin master: Fast-forward
3315172ea9ddd79ac1fceff8f6e96b7c261906a5 bbce2fd25fd52ad5d65f2fcd992be6d732fb2ab0 shiwali <shiwali@braintechnosys.biz> 1670398669 +0800	pull origin master: Fast-forward
bbce2fd25fd52ad5d65f2fcd992be6d732fb2ab0 858b4ea4336c7f0a3ff78448110c32d756031824 shiwali <shiwali@braintechnosys.biz> 1672124591 +0800	pull origin master: Fast-forward
858b4ea4336c7f0a3ff78448110c32d756031824 bf032ef334800807a5516854c65c9ea5630d9e7a shiwali <shiwali@braintechnosys.biz> 1672823267 +0800	pull origin master: Fast-forward
bf032ef334800807a5516854c65c9ea5630d9e7a 98d3036e3187077fb66fd745d0d3783e514a6f43 shiwali <shiwali@braintechnosys.biz> 1672824059 +0800	pull origin master: Fast-forward
98d3036e3187077fb66fd745d0d3783e514a6f43 224fe00e103d33d37c20d4311c14631d3b07ed3c shiwali <shiwali@braintechnosys.biz> 1672824630 +0800	pull origin master: Fast-forward
224fe00e103d33d37c20d4311c14631d3b07ed3c 6e4f52b6f1f468e798120d14f5108d63388077b5 shiwali <shiwali@braintechnosys.biz> 1672894972 +0800	pull origin master: Fast-forward
6e4f52b6f1f468e798120d14f5108d63388077b5 8d4f8fc551b933becdef454947f4c59f20b93998 shiwali <shiwali@braintechnosys.biz> 1673342619 +0800	commit: changes on sancy live server added
8d4f8fc551b933becdef454947f4c59f20b93998 f3abb431f3f617f260527e339b2c55be41621f0d shiwali <shiwali@braintechnosys.biz> 1673344553 +0800	pull origin master: Fast-forward
f3abb431f3f617f260527e339b2c55be41621f0d b387ce4973f3a6ed9af82f84c2447f4390f3a54c shiwali <shiwali@braintechnosys.biz> 1673507409 +0800	pull origin master: Fast-forward
b387ce4973f3a6ed9af82f84c2447f4390f3a54c 2fe76728f05751408a62aa44f58d5c847c4b934f shiwali <shiwali@braintechnosys.biz> 1673507853 +0800	pull origin master: Fast-forward
2fe76728f05751408a62aa44f58d5c847c4b934f 9216ca434e31f44eb9f31ebb30dd323da667fafc shiwali <shiwali@braintechnosys.biz> 1673946643 +0800	commit: ritesh changes on live on jewllery controller
9216ca434e31f44eb9f31ebb30dd323da667fafc 1d53c648c1889bb7929b6992cb2b81bdf29b1307 shiwali <shiwali@braintechnosys.biz> 1673947571 +0800	pull origin master: Fast-forward
1d53c648c1889bb7929b6992cb2b81bdf29b1307 bf1164f30456825549fea6a352cffeac970e0279 shiwali <shiwali@braintechnosys.biz> 1673947813 +0800	pull origin master: Fast-forward
bf1164f30456825549fea6a352cffeac970e0279 7ca2ad0290f30bd6a2ea4eca92d0ea0d24594ca2 shiwali <shiwali@braintechnosys.biz> 1674036747 +0800	pull origin master: Fast-forward
7ca2ad0290f30bd6a2ea4eca92d0ea0d24594ca2 f8e13ed942aeaa43d497d14d9c56748d8c3d33ec shiwali <shiwali@braintechnosys.biz> 1675078928 +0800	pull origin master: Fast-forward
f8e13ed942aeaa43d497d14d9c56748d8c3d33ec 84a605517667eff506e8fa3ebb69299be5b01af6 shiwali <shiwali@braintechnosys.biz> 1691661536 +0800	pull origin master: Fast-forward
84a605517667eff506e8fa3ebb69299be5b01af6 54934add025a65499e40345d6276cb6b4e4941ad shiwali <shiwali@braintechnosys.biz> 1691666980 +0800	pull origin master: Fast-forward
54934add025a65499e40345d6276cb6b4e4941ad bb650398ff847db2e72236783611b3c4c5ec10c3 shiwali <shiwali@braintechnosys.biz> 1692611097 +0800	pull origin master: Fast-forward
bb650398ff847db2e72236783611b3c4c5ec10c3 dc0a146535504f5b924c7a396b2e76d1814b2dfa shiwali <shiwali@braintechnosys.biz> 1692687071 +0800	pull origin master: Fast-forward
