Skip to content

merge Tommy APIJSON #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Jun 17, 2018
Merged

merge Tommy APIJSON #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8dc5f7b
Merge pull request #1 from TommyLemon/master
linlwqq Nov 18, 2017
e13bdef
merge apijson for news & newsCategory
Nov 18, 2017
bc44b61
Merge branch 'master' of https://github.com/linlwqq/APIJSON
Nov 18, 2017
3e37a82
Merge with my APIJSON news & newsCategory
Nov 18, 2017
8ac577f
Update pom.xml
TommyLemon Jun 17, 2018
ed80ae8
Update application.properties
TommyLemon Jun 17, 2018
42aa60f
Update SQLConfig.java
TommyLemon Jun 17, 2018
d2d6220
Update SQLConfig.java
TommyLemon Jun 17, 2018
e0949bb
Update Verifier.java
TommyLemon Jun 17, 2018
8a3d389
Update application.properties
TommyLemon Jun 17, 2018
56af51f
Update application.properties
TommyLemon Jun 17, 2018
854a86b
Update Verifier.java
TommyLemon Jun 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .idea/APIJSON.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

252 changes: 252 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading