Skip to content

Commit 317c0df

Browse files
dshaodshao
committed
Merge branch 'dev'
2 parents 22bbc89 + 6f8ab9f commit 317c0df

47 files changed

Lines changed: 134 additions & 41 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 2 additions & 1 deletion

‎pegr/gradle.properties‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ seleniumVersion=3.12.0
55
webdriverBinariesVersion=1.4
66
chromeDriverVersion=2.44
77
geckodriverVersion=0.23.0
8-
seleniumSafariDriverVersion=3.14.0
8+
seleniumSafariDriverVersion=3.14.0
9+
org.gradle.daemon=true
10+
org.gradle.parallel=true
11+
org.gradle.jvmargs=-Xmx1024M

‎pegr/grails-app/assets/images/admin_console.png‎

166 KB

‎pegr/grails-app/assets/images/admin_create.png‎

172 KB

‎pegr/grails-app/assets/images/admin_merge.png‎

316 KB

‎pegr/grails-app/assets/images/admin_merge2.png‎

60.9 KB

‎pegr/grails-app/assets/images/barcode_add_item.png‎

33.9 KB

‎pegr/grails-app/assets/images/barcode_add_item2.png‎

61.2 KB

‎pegr/grails-app/assets/images/barcode_experiment_edit.png‎

23 KB

‎pegr/grails-app/assets/images/barcode_inventory.png‎

-119 KB
Binary file not shown.

0 commit comments

Comments
 (0)