projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes HTML validation and user's sex retrieval in payment.
[platal.git]
/
configs
/
platal.ini
diff --git
a/configs/platal.ini
b/configs/platal.ini
index
a0cfbd1
..
4fcbe42
100644
(file)
--- a/
configs/platal.ini
+++ b/
configs/platal.ini
@@
-198,6
+198,13
@@
gmaps_key = ""
; URL of geocoding webservice
gmaps_url = "http://maps.google.com/maps/geo"
; URL of geocoding webservice
gmaps_url = "http://maps.google.com/maps/geo"
+; $globals->geocoder->gmaps_hl
+; Default output language.
+gmaps_hl = "fr"
+
+; $globals->geocoder->gmaps_gl
+; Default location preference.
+gmaps_gl = "fr"
; The lists section contains parameters used to interact with mailman.
[Lists]
; The lists section contains parameters used to interact with mailman.
[Lists]
@@
-381,3
+388,10
@@
auth_baseurl = ""
; Domain address where the aliases containing the list of (non-)subscribers
; of an event are created.
evts_domain = ""
; Domain address where the aliases containing the list of (non-)subscribers
; of an event are created.
evts_domain = ""
+
+; The merge section contains parameters about the merge's state.
+[Merge]
+
+; $globals->merge->state
+; Pending before the merge, done afterwards.
+state = "pending"