Merge branch 'master' into develop (fe8f7792) · Commits · Nounous / framadate · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

framadate
- Activity
- Members
- Releases
- Model registry

Snippets Groups Projects

fe8f7792

Commit fe8f7792 authored 9 years ago by Olivier PEREZ

Downloads
- Plain Diff

Merge branch 'master' into develop

parents 4fa4ee0a 67134126

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

app/classes/Framadate/Form.php 0 additions, 5 deletions

app/classes/Framadate/Form.php
app/classes/Framadate/Services/AdminPollService.php 4 additions, 17 deletions

app/classes/Framadate/Services/AdminPollService.php
app/classes/Framadate/Services/PollService.php 16 additions, 3 deletions

app/classes/Framadate/Services/PollService.php
create_classic_poll.php 10 additions, 11 deletions

create_classic_poll.php
create_date_poll.php 10 additions, 15 deletions

create_date_poll.php
locale/de.json 1 addition, 2 deletions

locale/de.json
locale/en.json 1 addition, 2 deletions

locale/en.json
locale/es.json 1 addition, 2 deletions

locale/es.json
locale/fr.json 1 addition, 2 deletions

locale/fr.json
locale/it.json 1 addition, 2 deletions

locale/it.json

with 45 additions and 61 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