Skip to content
GitLab
Explore
Sign in
Register
Commit
9893e01f
authored
Feb 03, 2014
by
Marius Cramer
Browse files
Merge remote-tracking branch 'origin/stable-3.0.5'
Conflicts: interface/lib/classes/remoting.inc.php server/cron_daily.php
parents
bca1af51
e20f18f3
Changes
12
Show whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment