From 4d50e394c5ea67dcebc05a2178033b42a34da882 Mon Sep 17 00:00:00 2001
From: Miha Petkovsek <miha.petkovsek@gmail.com>
Date: Wed, 14 Feb 2018 07:46:30 +0100
Subject: [PATCH] Updated readme.md

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2b872c9c..03854700 100755
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# php{ip}am
+# {php}IPAM
 Website: https://phpipam.net/
 
 ## Description
@@ -13,6 +13,12 @@ to be able to display javascript quickly and correctly.
  - [Update](https://phpipam.net/documents/upgrade/)
  - [Demo page](http://demo.phpipam.net) (Login: `Admin / ipamadmin`)
 
+## Branches
+ - MASTER: Current development release
+ - 1.3: Productional branch for 1.3.x release
+ - 1.2: Productional branch for 1.2.x release (obsolete)
+ - Other branches: Feature testing
+
 ## I forgot my Admin password!?
 Just run `php functions/scripts/reset-admin-password.php` in the cli and enter your new password
 
-- 
GitLab