Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test clases #45

Merged
merged 7 commits into from
Jul 28, 2017
Merged

test clases #45

merged 7 commits into from
Jul 28, 2017

Commits on Jul 21, 2017

  1. Merge origin/master 

    Conflicts:
	model/core/balance.php
    @jfernandez94
    jfernandez94 committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    1bf352d View commit details
    Browse the repository at this point in the history

  2. Merge origin/master

    @jfernandez94
    jfernandez94 committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    5cb2189 View commit details
    Browse the repository at this point in the history

  3. Merge origin/master 

    Conflicts:
	model/core/balance.php
    @jfernandez94
    jfernandez94 committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    ca72c37 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2017

  1. Merge origin/master

    @jfernandez94
    jfernandez94 committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    b3f4b5b View commit details
    Browse the repository at this point in the history

  2. Merge origin/master 

    Conflicts:
	model/core/balance.php
    @jfernandez94
    jfernandez94 committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    caf6f25 View commit details
    Browse the repository at this point in the history

  3. Merge origin/master 

    Conflicts:
	model/core/balance.php
    @jfernandez94
    jfernandez94 committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    24422bc View commit details
    Browse the repository at this point in the history

  4. Merge origin/master 

    Conflicts:
	model/core/balance.php
    @jfernandez94
    jfernandez94 committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    f39e405 View commit details
    Browse the repository at this point in the history