Diff for "ProjectosDiversos/LIP-ECO"

Differences between revisions 7 and 11 (spanning 4 versions)

LIP-ECO

$/!\$ Edit conflict - other version:

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

-  ⇤ ← Revision 7 as of 2018-09-24 14:01:50 → 
  Size: 192
  Editor: carlos
  Comment:
+   ← Revision 11 as of 2018-09-24 14:24:28 → ⇥
  Size: 453
  Editor: catarina
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-#acl AdminGroup:read,write,delete,revert,admin LIPECOGroup:read,write,delete,revert All:read
+#acl AdminGroup:read,write,delete,revert,admin LIPECOGroup:read,write,delete,revert,admin All:read
-Line 6:
+Line 5:
-[[LIPECOGroup|Resumos das reuniões semanais]]
+---- /!\ '''Edit conflict - other version:''' ----
[[ProjectosDiversos/LIP-ECO/LIPECOMeetings|Resumos das reuniões semanais]]

---- /!\ '''Edit conflict - your version:''' ----
[[ProjectosDiversos/LIP-ECO/LIPECOMeetings|Resumos das reuniões semanais]]

---- /!\ '''End of edit conflict''' ----