Merge branch 'develop'
Conflicts: db/StoredProcedures.sql ~dev_rating/application/bootstrap.php ~dev_rating/application/classes/FileParser.php
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- db/Sample.sql 0 additions, 306 deletionsdb/Sample.sql
- db/StoredFunctions.sql 2249 additions, 0 deletionsdb/StoredFunctions.sql
- db/StoredProcedures.sql 877 additions, 4257 deletionsdb/StoredProcedures.sql
- db/Structure.sql 70 additions, 41 deletionsdb/Structure.sql
- db/Views.sql 158 additions, 0 deletionsdb/Views.sql
- db/duplicate.sql 49 additions, 0 deletionsdb/duplicate.sql
- db/fix.sql 88 additions, 5 deletionsdb/fix.sql
- db/release_gen_mmcs_sg.sql 2 additions, 2 deletionsdb/release_gen_mmcs_sg.sql
- doc/dev/index.html 897 additions, 0 deletionsdoc/dev/index.html
- doc/dev/index.md 22 additions, 0 deletionsdoc/dev/index.md
- doc/dev/installation.html 949 additions, 0 deletionsdoc/dev/installation.html
- doc/dev/installation.md 65 additions, 0 deletionsdoc/dev/installation.md
- doc/dev/testing/kohana/mockobjects.html 1150 additions, 0 deletionsdoc/dev/testing/kohana/mockobjects.html
- doc/dev/testing/kohana/mockobjects.md 0 additions, 0 deletionsdoc/dev/testing/kohana/mockobjects.md
- doc/dev/testing/kohana/testing_workflows.html 909 additions, 0 deletionsdoc/dev/testing/kohana/testing_workflows.html
- doc/dev/testing/kohana/testing_workflows.md 0 additions, 0 deletionsdoc/dev/testing/kohana/testing_workflows.md
- doc/dev/testing/kohana/troubleshooting.html 890 additions, 0 deletionsdoc/dev/testing/kohana/troubleshooting.html
- doc/dev/testing/kohana/troubleshooting.md 0 additions, 0 deletionsdoc/dev/testing/kohana/troubleshooting.md
- doc/dev/testing/kohana/usage.html 994 additions, 0 deletionsdoc/dev/testing/kohana/usage.html
Please register or sign in to comment