Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dolibarr
- Activity
- Members

Snippets Groups Projects

5aee7131

Commit 5aee7131 authored 11 years ago by Laurent Destailleur

Downloads
- Plain Diff

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

parents 18f4eabb b77e068a

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

htdocs/adherents/card_subscriptions.php 71 additions, 48 deletions

htdocs/adherents/card_subscriptions.php
htdocs/core/lib/functions.lib.php 28 additions, 0 deletions

htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/errors.lang 1 addition, 0 deletions

htdocs/langs/en_US/errors.lang
htdocs/langs/en_US/main.lang 1 addition, 0 deletions

htdocs/langs/en_US/main.lang
htdocs/langs/en_US/paypal.lang 3 additions, 0 deletions

htdocs/langs/en_US/paypal.lang
htdocs/public/paybox/paymentok.php 15 additions, 6 deletions

htdocs/public/paybox/paymentok.php
htdocs/public/paypal/paymentok.php 49 additions, 19 deletions

htdocs/public/paypal/paymentok.php

with 168 additions and 73 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