Merge remote-tracking branch 'remotes/origin/development' (c5abdee0) · 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

c5abdee0

Commit c5abdee0 authored 12 years ago by alvaro

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/origin/development'

parents a5b447e5 2ab1b162

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

classes/Utils.php 1 addition, 1 deletion

classes/Utils.php
classes/modules/exportModule.php 377 additions, 0 deletions

classes/modules/exportModule.php
classes/modules/sessionModule.php 4 additions, 3 deletions

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

common.inc.php
index.php 1 addition, 1 deletion

index.php

with 384 additions and 6 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