Merge pull request #100 from pranotiTechjoomla/master1

Task #132321 feat: Remove conflict while pushing tjreport1.0 branch to master
techjoomla · Aug 14, 2018 · 74f4ada · 74f4ada
2 parents 27e2864 + 1ffaabf
commit 74f4ada
Show file tree

Hide file tree

Showing 62 changed files with 6,104 additions and 6,042 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1 @@
-# TJ Reports - Universal Reporting Engine for Joomla
-
-TJ Reports is a horizontal/Infrastructure extension for Joomla that allows developers to develop reporting plugins with ease along with providing extensive reporting capabilities in their extensions. Features include extension specific and multi extension reports, Report default configuration, Report customisation and CSV exports to name a few.
-
-Please refer the Wiki for documentation on how to create your own Reporting plugins and integrate it with your extensions. 
+# Contribution guide
diff --git a/tjreports/administrator/assets/js/jquery.twbsPagination.js b/tjreports/administrator/assets/js/jquery.twbsPagination.js