Merge branch 'master' into hotfixes (68150c60) · Commits · uib-ub / Spesialsamlingene / marcus-lodspeakr · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

marcus-lodspeakr
- Activity
- Members
- Labels
- Wiki

Snippets Groups Projects

68150c60

Commit 68150c60 authored 13 years ago by alvaro

Downloads
- Plain Diff

Merge branch 'master' into hotfixes

parents 96ded389 7f6c91e7

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

classes/Queries.php 3 additions, 2 deletions

classes/Queries.php
classes/Utils.php 0 additions, 3 deletions

classes/Utils.php
classes/modules/serviceModule.php 125 additions, 113 deletions

classes/modules/serviceModule.php
classes/modules/typeModule.php 41 additions, 26 deletions

classes/modules/typeModule.php
classes/modules/uriModule.php 3 additions, 1 deletion

classes/modules/uriModule.php
common.inc.php 1 addition, 1 deletion

common.inc.php
install.sh 1 addition, 13 deletions

install.sh
utils/create_db.sh 20 additions, 0 deletions

utils/create_db.sh

with 194 additions and 159 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment